[Xfce4-commits] <thunar-vcs-plugin:thunarx-2> Merge branch 'master' into thunarx-2
Peter de Ridder
noreply at xfce.org
Sun Nov 29 19:06:14 CET 2009
Updating branch refs/heads/thunarx-2
to d71f86ea9cc5ae53b9727c4d7ac756ca5c2c14ca (commit)
from 3374e57cb1a5cc7ba1438f0088c18e93d63c9182 (commit)
commit d71f86ea9cc5ae53b9727c4d7ac756ca5c2c14ca
Merge: 3374e57cb1a5cc7ba1438f0088c18e93d63c9182 2872d1eaf3f1777aafb1ea48bf36b5040be7ee3d
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 29 11:25:50 2009 +0100
Merge branch 'master' into thunarx-2
Conflicts:
thunar-vcs-plugin/tvp-provider.c
commit 2872d1eaf3f1777aafb1ea48bf36b5040be7ee3d
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 8 17:24:04 2009 +0100
* README: Added move to the list.
commit eb5a842fb8901bc8b5098d761e7deccd2e741df6
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 8 17:15:36 2009 +0100
Post release git tag added.
commit 5cb0f3949e615bb81a048101cb48db95a2db4c1f
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 8 17:10:40 2009 +0100
=== Released 0.1.2 ===
commit d1bc519d3ea05fd8e738da42c1a60477536f94ec
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 8 17:05:04 2009 +0100
Updated po files.
* po/POTFILES.in: Added missing files.
commit b569d3b43feb8572c5c0ff46016e41f29912106a
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 8 17:00:18 2009 +0100
* thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled.
* tvp-git-helper/tgh-{add,move,reset}.c: Fixed WEXITSTATUS includes.
commit 6132b287a5f479fd62fcbac18973b3103304e6df
Author: Peter de Ridder <peter at xfce.org>
Date: Sat Nov 7 18:31:17 2009 +0100
* Changelog: Updated.
commit 3c282e44a9ef6fa4b105ab9e0669fc2ced8f20bb
Author: Peter de Ridder <peter at xfce.org>
Date: Sat Nov 7 18:28:36 2009 +0100
Updated po files.
commit b1c4e4b22ccce35cc2f9000663155de542aa5b7f
Author: Peter de Ridder <peter at xfce.org>
Date: Sat Nov 7 18:25:49 2009 +0100
* tvp-git-helper/tgh-{add,blame,clean,log,reset}.c: Changed deprecated
g_dirname in g_path_get_dirname.
* tvp-git-helper/tgh-reset.c: Don't pass dialog as parent for the error
dialog.
commit 7ad4d3df2c23f6acc2679f6f7da6c3dda390a880
Author: Peter de Ridder <peter at xfce.org>
Date: Sat Nov 7 18:18:13 2009 +0100
* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
tvp-git-helper/tgh-move.[ch]: Added move action.
* tvp-git-helper/tgh-common.c: Correctly exit the helper if no parent
was given for an error dialog.
commit 6caa3f0f37898d4b01ee892c9b437e872ea810bc
Author: Leandro Regueiro <leandro.regueiro at gmail.com>
Date: Thu Nov 5 16:32:30 2009 +0000
l10n: Updates to Galician (gl) translation
Transmitted-via: Transifex (translations.xfce.org)
commit bed4c03df78c5dc02e7c61b8a3314ffa6e1dac46
Author: Peter de Ridder <peter at xfce.org>
Date: Mon Nov 2 20:57:06 2009 +0100
* tvp-svn-helper/tsh-file-selection-dialog.c(get_parent_status): Fixed
possible infinite loop. Fixing bug #5916.
commit f1bd85694a7ad630c3d36ffde87bc62def6da6de
Author: Ignacio Velasco <elega at elega.com.ar>
Date: Tue Oct 27 20:55:10 2009 +0000
l10n: Updates to Spanish (Castilian) (es) translation
Transmitted-via: Transifex (translations.xfce.org)
commit cb88e9673ee4632e46bea442f753a35efe563481
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 25 23:10:40 2009 +0100
Updated po files
* tvp-svn-helper/tvp-properties-dialog.c
tvp-svn-helper/tvp-status-dialog.c: Improved depth combo box.
commit 308bd813b02dc820e6a5857d8c765afd13120222
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 25 23:07:25 2009 +0100
* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
tvp-git-helper/tgh-common.[ch]
tvp-git-helper/tgh-clean{,-dialog}.[ch]: Added clean action.
commit ef4219bf85cd30b554dab08ba8e3d6730b51304b
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 25 14:38:00 2009 +0100
* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
tvp-git-helper/tgh-common.[ch]
tvp-git-helper/tgh-blame{,-dialog}.[ch]: Added blame action.
commit 76ce9ffac4c45b6990b605bde754a36c73ef73aa
Author: Michal Várady <miko.vaji at gmail.com>
Date: Sun Oct 25 10:43:29 2009 +0000
l10n: Updates to Czech (cs) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 7db45bdc03f51fea1f0df65d5767a70cf1c0ea4e
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 25 00:59:52 2009 +0200
Updated po files
commit 06d7670fea400a2856d9c6beb510c5d3e7d02f45
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 25 00:49:36 2009 +0200
* tvp-git-helper/tgh-clone.c: Fixed a memory leak.
* tvp-git-helper/tgh-log-dialog.c: Removed expander column.
* tvp-svn-helper/tsh-log-dialog.c: Changed "File" to "Path".
* tvp-svn-helper/tsh-properties-dialog.c: Swapped signal emit and tree
clear order.
commit 8f4ba0b888e20c4045f1d252c531c093e8a7b690
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 25 00:45:40 2009 +0200
* thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
tvp-git-helper/tgh-common.[ch]
tvp-git-helper/tgh-stash{,-dialog}.[ch]: Added stash action.
commit 3aa180a79c07d4855f6c779ac951d047dc164b10
Author: Peter de Ridder <peter at xfce.org>
Date: Sat Oct 24 14:50:14 2009 +0200
* icons/: Added git icons and 16x16 subversion icon.
commit 6f7451158345cf3745df63ae0f4450e9cff78757
Author: Peter de Ridder <peter at xfce.org>
Date: Sat Oct 24 14:49:34 2009 +0200
Post commit git tag added.
commit aaaf95912f9d69ab2eb58a1991eb69a08c9f3b5d
Author: Peter de Ridder <peter at xfce.org>
Date: Fri Oct 23 21:15:01 2009 +0200
=== Released 0.1.1 ===
commit e0fc3205d378548e06f08112b24b7d80de2a17d0
Author: Peter de Ridder <peter at xfce.org>
Date: Fri Oct 23 15:38:22 2009 +0200
* tvp-git-helper/tgh-clone.c: Added -- to the argument list.
* po/*: Updated po files.
commit 2cf5cf3a3bea075b4ff2db4218925874183d28e0
Author: Peter de Ridder <peter at xfce.org>
Date: Fri Oct 23 15:26:33 2009 +0200
* tvp-git-helper/tgh-add.c tvp-git-helper/tgh-common.[ch]
tvp-git-helper/tgh-notify-dialog.[ch]: Added notify dialog to make add
more verbose.
* tvp-git-helper/tgh-common.c
tvp-git-helper/tgh-file-selection-dialog.c: Improved status output
parsing.
commit 4ec787eadf9705d7b66af44f83aaf78df17f4383
Author: Peter de Ridder <peter at xfce.org>
Date: Fri Oct 23 14:58:34 2009 +0200
* tvp-git-helper/tgh-reset{,-dialog}.[ch]: Replaced the reset dialog by
message boxes.
commit 93e8e9f94d7e43f9cb927fd0a6e25ae69c662b9e
Author: Peter de Ridder <peter at xfce.org>
Date: Wed Oct 14 23:03:49 2009 +0200
* tvp-git-helper/tgh-{add,reset}.c: Made chdir work correct.
* tvp-git-helper/tgh-file-selection-dialog.[ch]: Don't use input files
for git call since this gives the wrong results.
commit 5782267e5a5790db8521f9a671cd514b693fe582
Author: Peter de Ridder <peter at xfce.org>
Date: Wed Oct 14 22:18:19 2009 +0200
* po/POTFILES.in: added git helper files.
* po/thunar-vcs-plugin.pot po/*.po: updated po files.
commit ce00efd125e8de3f51d7625d67aed6a31d252bc8
Author: Peter de Ridder <peter at xfce.org>
Date: Wed Oct 14 22:13:28 2009 +0200
* thunar-vcs-lpugin/tvp-git-action.c tvp-git-helper/Makefile.am
tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch]
tvp-git-helper/tgh-log{-dialog,}.[ch]: Added log action.
commit 956d4903bccd42425a79ae546d0ae2dabdff1317
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 11 23:21:15 2009 +0200
* thunar-vcs-plugin/tvp-provider.c
thunar-vcs-plugin/tvp-git-action.[ch]: Added extra flags to
tvp_git_action_new.
* thunar-vcs-plugin/yvp-{svn,git}-action.c: Only show menu items if they
are implemented.
commit 134427c074ba04a2e94390e7f6be105921d978d0
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Oct 11 23:17:25 2009 +0200
* tvp-git-helper/main.c tvp-git-helper/tgh-clone.[ch]
tvp-git-helper/tgh-transfer-dialog.[ch]: Added clone action.
* tvp-git-helper/tgh-{add,branch,reset,status}.[ch]: Cleaned the code a
bit.
commit bf9e5ebcc8e25bcad1e4032b6e711bb9c79bf71f
Author: Peter de Ridder <peter at xfce.org>
Date: Tue Sep 29 23:48:23 2009 +0200
Updated po files.
Added post release git tag to configure.ac
Fixed some mistakes in Changelog.
commit 4331a369bea25840216c1dea26786077697fc4bd
Author: Peter de Ridder <peter at xfce.org>
Date: Tue Sep 29 23:36:56 2009 +0200
* tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
translations.
* tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty
string before translations, otherwise the po header will be returned.
* */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS
overriding.
commit ff3d8b861461414efc3ce272ac567e7059830e97
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Sep 27 16:18:09 2009 +0200
Made project ready for release
commit 276f87c58df2a25a8e2f8503248412449d7440af
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Sep 27 16:10:47 2009 +0200
* po/POTFILES.in: added thunar-vc-plugin/tvp-git-action.c
commit 82a7acf341f1a774faa280cac6efe305deb83bbf
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Sep 27 15:35:09 2009 +0200
added intltool files to .gitignore
commit 663965cd50525ae2b7a43cd99cc09d50f2c27936
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Sep 27 15:28:05 2009 +0200
* Made Thuner VCS Plugin compile with --enable-debug=full.
* Updated the po file.
commit 62e7c3f1ac9edb49e7315fbf4eb4bb1cc3e6ef70
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Sep 27 13:14:53 2009 +0200
* autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
xfce4-dev-tools, now.
* tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
directory deletion.
commit 8d25653224e304889d941de8ed4ee6ad8b581c62
Author: Rihards Prieditis <rprieditis at gmail.com>
Date: Fri Sep 18 20:21:24 2009 +0000
l10n: Updates to Latvian (lv) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 4e256a0b2b6b6d50f504e4a8dcd3021b54afa817
Author: Rihards Prieditis <rprieditis at gmail.com>
Date: Fri Sep 18 20:18:11 2009 +0000
l10n: Updates to Latvian (lv) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 4f002d4645045c2de260c48cc0f305b910e1b6e8
Author: Carles Muñoz Gorriz <carlesmu at internautas.org>
Date: Sat Sep 5 13:28:45 2009 +0000
l10n: Updates to Catalan (Valencian) (ca) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 0115351d469b585111e4178d0d3be0b8373856e3
Merge: 6962231135b468c9735e9decb32c9ff1be35340d c05c65399f1876559ec185684891ec7b249b5e15
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Aug 30 11:40:41 2009 +0200
Merge branch 'master' of ssh://git.xfce.org/git/thunar-plugins/thunar-vcs-plugin
commit c05c65399f1876559ec185684891ec7b249b5e15
Author: Jeff Bailes <thepizzaking at gmail.com>
Date: Sun Aug 30 09:33:55 2009 +0000
l10n: Updates to English (United Kingdom) (en_GB) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 6962231135b468c9735e9decb32c9ff1be35340d
Author: Peter de Ridder <peter at xfce.org>
Date: Thu Aug 27 22:37:36 2009 +0200
* tvp-svn-helper/tsh-commit.c
tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
Using recursion info in file selection and commit command to be able
to commit directory deletion.
* tvp-svn-helper/tsh-delete.c: Removed TSH_FILE_SELECTION_FLAG_MODIFIED
flag.
* tvp-svn-helper/tsh-revert.c: Added
TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.
commit 861ecd7dbcf1aca9616e0a14d0f2bd66a7ca9c4c
Author: Peter de Ridder <peter at xfce.org>
Date: Thu Aug 27 22:32:14 2009 +0200
Added .gitignore
commit 5cf43454157f3ebcaff789fde9b1cf0ae375e3d7
Author: Per Kongstad <p_kongstad at op.pl>
Date: Wed Aug 19 21:52:42 2009 +0000
l10n: Updates to Danish (da) translation
Transmitted-via: Transifex (translations.xfce.org)
.gitignore | 35 +
ChangeLog | 183 +++-
NEWS | 30 +-
README | 32 +-
autogen.sh | 22 +-
configure.ac.in | 64 +-
icons/16x16/Makefile.am | 9 +-
icons/16x16/git.png | Bin 0 -> 149 bytes
icons/16x16/subversion.png | Bin 0 -> 613 bytes
icons/24x24/Makefile.am | 2 +
icons/24x24/git.png | Bin 0 -> 253 bytes
icons/48x48/Makefile.am | 2 +
icons/48x48/git.png | Bin 0 -> 342 bytes
po/POTFILES.in | 51 +-
po/ar.po | 1179 +++++++++------
po/ca.po | 1371 ++++++++++-------
po/cs.po | 1248 ++++++++++------
po/da.po | 1250 ++++++++++------
po/de.po | 1249 ++++++++++------
po/en_GB.po | 1357 ++++++++++-------
po/es.po | 1320 ++++++++++-------
po/fr.po | 1265 ++++++++++------
po/gl.po | 1531 +++++++++++--------
po/hu.po | 1264 ++++++++++------
po/id.po | 1249 ++++++++++------
po/lv.po | 1608 +++++++++++---------
po/nl.po | 1237 ++++++++++------
po/pl.po | 1233 ++++++++++------
po/pt.po | 1250 ++++++++++------
po/pt_BR.po | 1250 ++++++++++------
po/sv.po | 1217 +++++++++------
po/thunar-vcs-plugin.pot | 1179 +++++++++------
po/ur.po | 1249 ++++++++++------
po/ur_PK.po | 1249 ++++++++++------
po/zh_CN.po | 1249 ++++++++++------
thunar-vcs-plugin/Makefile.am | 20 +-
thunar-vcs-plugin/thunar-vcs-plugin.c | 11 +-
thunar-vcs-plugin/tvp-git-action.c | 47 +-
thunar-vcs-plugin/tvp-git-action.h | 2 +
thunar-vcs-plugin/tvp-provider.c | 52 +-
thunar-vcs-plugin/tvp-svn-action.c | 9 +-
thunar-vcs-plugin/tvp-svn-backend.c | 21 +-
thunar-vcs-plugin/tvp-svn-backend.h | 4 +-
thunar-vcs-plugin/tvp-svn-property-page.c | 2 +-
tvp-git-helper/Makefile.am | 31 +-
tvp-git-helper/main.c | 107 ++
tvp-git-helper/tgh-add.c | 82 +-
.../{tgh-reset-dialog.c => tgh-blame-dialog.c} | 105 +-
tvp-git-helper/tgh-blame-dialog.h | 53 +
tvp-git-helper/tgh-blame.c | 95 ++
tvp-git-helper/{tgh-reset.h => tgh-blame.h} | 8 +-
tvp-git-helper/tgh-branch.c | 12 +-
tvp-git-helper/tgh-clean-dialog.c | 171 +++
tvp-git-helper/tgh-clean-dialog.h | 58 +
tvp-git-helper/tgh-clean.c | 147 ++
tvp-git-helper/{tgh-reset.h => tgh-clean.h} | 8 +-
tvp-git-helper/{tgh-add.c => tgh-clone.c} | 55 +-
tvp-git-helper/{tgh-reset.h => tgh-clone.h} | 8 +-
tvp-git-helper/tgh-common.c | 411 +++++-
tvp-git-helper/tgh-common.h | 17 +-
tvp-git-helper/tgh-file-selection-dialog.c | 56 +-
tvp-git-helper/tgh-file-selection-dialog.h | 1 -
tvp-git-helper/tgh-log-dialog.c | 380 +++++
tvp-git-helper/tgh-log-dialog.h | 64 +
tvp-git-helper/{tgh-branch.c => tgh-log.c} | 80 +-
tvp-git-helper/{tgh-add.h => tgh-log.h} | 8 +-
tvp-git-helper/tgh-move.c | 157 ++
tvp-git-helper/{tgh-add.h => tgh-move.h} | 8 +-
.../{tgh-reset-dialog.c => tgh-notify-dialog.c} | 42 +-
tvp-git-helper/tgh-notify-dialog.h | 50 +
tvp-git-helper/tgh-reset-dialog.h | 50 -
tvp-git-helper/tgh-reset.c | 107 +-
tvp-git-helper/tgh-stash-dialog.c | 618 ++++++++
tvp-git-helper/tgh-stash-dialog.h | 55 +
tvp-git-helper/tgh-stash.c | 377 +++++
tvp-git-helper/{tgh-add.h => tgh-stash.h} | 8 +-
tvp-git-helper/tgh-status.c | 12 +-
tvp-git-helper/tgh-transfer-dialog.c | 228 +++
tvp-git-helper/tgh-transfer-dialog.h | 50 +
tvp-svn-helper/Makefile.am | 3 +-
tvp-svn-helper/main.c | 3 +
tvp-svn-helper/tsh-blame.c | 2 +-
tvp-svn-helper/tsh-cleanup.c | 2 +-
tvp-svn-helper/tsh-commit.c | 98 +-
tvp-svn-helper/tsh-common.c | 70 +-
tvp-svn-helper/tsh-common.h | 4 +-
tvp-svn-helper/tsh-copy.c | 9 +-
tvp-svn-helper/tsh-delete.c | 2 +-
tvp-svn-helper/tsh-file-selection-dialog.c | 361 ++++-
tvp-svn-helper/tsh-file-selection-dialog.h | 18 +-
tvp-svn-helper/tsh-lock-dialog.c | 3 +-
tvp-svn-helper/tsh-lock.c | 2 +-
tvp-svn-helper/tsh-log-dialog.c | 2 +-
tvp-svn-helper/tsh-log-message-dialog.c | 3 +-
tvp-svn-helper/tsh-log.c | 2 +-
tvp-svn-helper/tsh-move.c | 9 +-
tvp-svn-helper/tsh-properties-dialog.c | 18 +-
tvp-svn-helper/tsh-properties.c | 4 +-
tvp-svn-helper/tsh-relocate-dialog.c | 5 +-
tvp-svn-helper/tsh-relocate.c | 2 +-
tvp-svn-helper/tsh-revert.c | 8 +-
tvp-svn-helper/tsh-status-dialog.c | 7 +-
tvp-svn-helper/tsh-status.c | 2 +-
tvp-svn-helper/tsh-transfer-dialog.c | 5 +-
104 files changed, 20866 insertions(+), 11099 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e3a21c1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,35 @@
+aclocal.m4
+autom4te.cache
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.ac
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+depcomp
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+mkinstalldirs
+stamp-h1
+.deps
+.libs
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
+po/*gmo
+thunar-vcs-plugin/thunar-vcs-plugin.la
+thunar-vcs-plugin/thunar_vcs_plugin_la-*.lo
+tvp-git-helper/tvp-git-helper
+tvp-git-helper/tvp_git_helper-*.o
+tvp-svn-helper/tvp-svn-helper
+tvp-svn-helper/tvp_svn_helper-*.o
diff --git a/ChangeLog b/ChangeLog
index dbfd09b..8aed218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,176 @@
+2009-11-08 Peter de Ridder <peter at xfce.org>
+
+ * === Released 0.1.2 ===
+ * thunar-vcs-plugin/tvp-provider.c: Fixed build when svn is disabled.
+ * tvp-git-helper/tgh-{add,move,reset}.c: Fixed WEXITSTATUS includes.
+
+2009-11-07 Peter de Ridder <peter at xfce.org>
+
+ * tvp-git-helper/tgh-{add,blame,clean,log,reset}.c: Changed deprecated
+ g_dirname in g_path_get_dirname.
+ * tvp-git-helper/tgh-reset.c: Don't pass dialog as parent for the
+ error dialog.
+ * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
+ tvp-git-helper/tgh-move.[ch]: Added move action.
+ * tvp-git-helper/tgh-common.c: Correctly exit the helper if no parent
+ was given for an error dialog.
+
+2009-11-02 Peter de Ridder <peter at xfce.org>
+
+ * tvp-svn-helper/tsh-file-selection-dialog.c(get_parent_status): Fixed
+ possible infinite loop. Fixing bug #5916.
+
+2009-10-25 Peter de Ridder <peter at xfce.org>
+
+ * tvp-svn-helper/tvp-properties-dialog.c
+ tvp-svn-helper/tvp-status-dialog.c: Improved depth combo box.
+ * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
+ tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-clean{,-dialog}.[ch]: Added clean action.
+ * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
+ tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-blame{,-dialog}.[ch]: Added blame action.
+ * tvp-git-helper/tgh-clone.c: Fixed a memory leak.
+ * tvp-git-helper/tgh-log-dialog.c: Removed expander column.
+ * tvp-svn-helper/tsh-log-dialog.c: Changed "File" to "Path".
+ * tvp-svn-helper/tsh-properties-dialog.c: Swapped signal emit and tree
+ clear order.
+ * thunar-vcs-plugin/tvp-git-action.c tvp-git-helper/main.c
+ tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-stash{,-dialog}.[ch]: Added stash action.
+
+2009-10-24 Peter de Ridder <peter at xfce.org>
+
+ * icons/: Added git icons and 16x16 subversion icon.
+
+2009-10-23 Peter de Ridder <peter at xfce.org>
+
+ * === Released 0.1.1 ===
+ * tvp-git-helper/tgh-clone.c: Added -- to the argument list.
+ * po/*: Updated po files.
+ * tvp-git-helper/tgh-add.c tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-notify-dialog.[ch]: Added notify dialog to make add
+ more verbose.
+ * tvp-git-helper/tgh-common.c
+ tvp-git-helper/tgh-file-selection-dialog.c: Improved status output
+ parsing.
+ * tvp-git-helper/tgh-reset{,-dialog}.[ch]: Replaced the reset dialog by
+ message boxes.
+
+2009-10-14 Peter de Ridder <peter at xfce.org>
+
+ * tvp-git-helper/tgh-{add,reset}.c: Made chdir work correct.
+ * tvp-git-helper/tgh-file-selection-dialog.[ch]: Don't use input files
+ for git call since this gives the wrong results.
+ * po/POTFILES.in: added git helper files.
+ * po/thunar-vcs-plugin.pot po/*.po: updated po files.
+ * thunar-vcs-lpugin/tvp-git-action.c tvp-git-helper/Makefile.am
+ tvp-git-helper/main.c tvp-git-helper/tgh-common.[ch]
+ tvp-git-helper/tgh-log{-dialog,}.[ch]: Added log action.
+
+2009-10-11 Peter de Ridder <peter at xfce.org>
+
+ * thunar-vcs-plugin/tvp-provider.c
+ thunar-vcs-plugin/tvp-git-action.[ch]: Added extra flags to
+ tvp_git_action_new.
+ * thunar-vcs-plugin/yvp-{svn,git}-action.c: Only show menu items if they
+ are implemented.
+ * tvp-git-helper/main.c tvp-git-helper/tgh-clone.[ch]
+ tvp-git-helper/tgh-transfer-dialog.[ch]: Added clone action.
+ * tvp-git-helper/tgh-{add,branch,reset,status}.[ch]: Cleaned the code a
+ bit.
+
+2009-09-29 Peter de Ridder <peter at xfce.org>
+
+ * tvp-{svn,git}-helper/main.c: Added xfce_textdomain to correctly init
+ translations.
+ * tvp-svn-helper/tsh-comon.c(tsh_status_to_string): Check for empty
+ string before translations, otherwise the po header will be
+ returned.
+ * */Makefile.am: Removed deprecated INCLUDES and fix AM_CPPGLAGS
+ overriding.
+
+2009-09-27 Peter de Ridder <peter at xfce.org>
+
+ * === Released 0.1.0 ===
+ * Made Thuner VCS Plugin compile with --enable-debug=full.
+ * Updated the po files.
+ * autogen.sh configure.ac.in: Changed scripts to xfce4-dev-tools
+ version 4.7.2. Thunar VCS Plugin depends on 4.7.2 of
+ xfce4-dev-tools, now.
+ * tvp-svn-helper/tsh-file-selection-dialog.c: Fixed revert for
+ directory deletion.
+ * tvp-svn-helper/tsh-commit.c
+ tvp-svn-helper/tsh-file-selection-dialog.[ch]: Better file Selector.
+ Using recursion info in file selection and commit command to be able
+ to commit directory deletion.
+ * tvp-svn-helper/tsh-delete.c: Removed TSH_FILE_SELECTION_FLAG_MODIFIED
+ flag.
+ * tvp-svn-helper/tsh-revert.c: Added
+ TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN flag.
+ * tvp-svn-helper/tsh-delete.c(delete_thread): Fixed segfault.
+ * tvp-svn-helper/tsh-file-selection-dialog.[ch]: Support for
+ unversioned directory trees.
+ * tvp-svn-helper/tsh-revert.c(revert_thread): Execute revert in
+ reverse directory order.
+ * tvp-svn-helper/tsh-add.c: Support for non-recursive add.
+ * tvp-svn-helper/tsh-log-dialog.c: Fixed 2 missing characters in last
+ commit.
+ * tvp-svn-helper/tsh-commit.c: Support adding unversioned files before
+ commiting. This fixes bug #3921.
+
+2009-07-26 Peter de Ridder <peter at xfce.org>
+
+ * thunar-vcs-plugin/tvp-svn-action.c: The add context menu item is now
+ visible on folder background menu too.
+ * tvp-svn-helper/tsh-{file-selection,log-message,log,status}-dialog.c:
+ The file lists are tree views now.
+ * tvp-svn-helper/tsh-tree-common.[ch]: Common routines to build a tree
+ view of files.
+ * tvp-svn-helper/tsh-common.c(tsh_log_func)
+ tvp-svn-helper/tsh-log-dialog.[ch]: Support has_children for log
+ entries.
+ * tvp-svn-helper/Makefile.am: tsh-tree-common.[ch] added.
+
+2009-07-25 Peter de Ridder <peter at xfce.org>
+
+ * thunar-vcs-plugin/tvp-svn-backend.c(tvp_svn_backend_init,
+ tvp_svn_backend_free): Changed the libsvn init. Not using
+ svn_cmdline_init anymore. This fixes bug #5106.
+ * thunar-vcs-plugin/tvp-svn-action.c(tvp_svn_action_create_menu_item):
+ Made the changelist menu item popup unimplemented.
+ * tvp-git-helper/tgh-{add,common}.c: Fixed system includes.
+ * configure.ac.in: Added check for 'sys/wait.h'.
+ * tvp-svn-helper/gtk*.[ch]: Removed the gtkfilechooser files from the
+ project.
+ * tvp-svn-helper/ths-log.c(log_thread): Fixed libsvn 1.5 support.
+ * tvp-svn-helper/tsh-common.c: Fixed compiler compatibility.
+ * tvp-svn-helper/tsh-resolved.c(resolved_thread): Added initializer
+ for posible uninintialized variable.
+
+2009-07-10 Peter de Ridder <peter at xfce.org>
+
+ * configure.ac.in: Added flags to disable subversion or git support.
+
+2009-06-28 Peter de Ridder <peter at xfce.org>
+
+ * Renaming the thunar-svn-plugin to thunar-vcs-plugin.
+ * Added basic git support to the thunar-vcs-plugin.
+
+2009-06-28 Peter de Ridder <peter at xfce.org>
+
+ * thunar-svn-plugin.c: Added add_subaction{,_u} to save alot of code
+ for adding items to the action menu.
+
+2009-04-30 Peter de Ridder <peter at xfce.org>
+
+ * configure.ac.in: version incremented after release.
+ * thunar-svn-plugin tsp-svn-helper: changed functions to svn 1.6 api.
+
+2009-03-15 Peter de Ridder <peter at xfce.org>
+
+ * Added comments about 1.5 recursion information for translators.
+
2009-03-14 Peter de Ridder <peter at xfce.org>
* === Released 0.0.3 ===
@@ -10,14 +183,14 @@
2009-02-27 Peter de Ridder <peter at xfce.org>
* thunar-svn-helper/tsh-{transfer,relocate}-dialog.c
- thunar-svn-helper/Makefile: Removed gtkfilechooserentry which got
- broken with the later version of gtk.
+ thunar-svn-helper/Makefile: Removed gtkfilechooserentry which got
+ broken with the later version of gtk.
* INSTALL: Updated to newer version provided by the auto tools.
2008-07-17 Peter de Ridder <peter at xfce.org>
* tsp-svn-helper/main.c: Fixed bug by moving gtk_threads_enter
- directly behind gdk_threads_init.
+ directly behind gdk_threads_init.
2008-06-16 Peter de Ridder <peter at xfce.org>
@@ -25,14 +198,14 @@
* thunar-svn-plugin/tsp-svn-action.c thunar-svn-plugin/tsp-provider.c:
Created signal which is emitted on new process spawn.
-2008-06-09 Peter de Ridder <peter at xfce.org>
+2008-06-11 Peter de Ridder <peter at xfce.org>
* thunar-svn-plugin/tsp-svn-action.c tsp-svn-helper/main.c
tsp-svn-helper/tsh-blame.[ch] tsp-svn-helper/tsh-blame-dialog.[ch]:
Added Subversion blame action.
* tsp-svn-helper/tsh-resolved.c: Added file selection dialog.
-2008-06-11 Peter de Ridder <peter at xfce.org>
+2008-06-10 Peter de Ridder <peter at xfce.org>
* thunar-svn-plugin/tsh-svn-action.c tsp-svn-helper/main.c
tsp-svn-helper/tsh-relocate.[ch] tsp-svn-helper/tsh-relocate.[ch]:
diff --git a/NEWS b/NEWS
index c691bee..872964d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,33 @@
-0.0.3
+0.1.2
=====
+- More git actions are added: blame, clean, move and stash.
+- Git icon added.
+
+0.1.1
+=====
+- Unimplemented options are hidden in menu.
+- Problems with text domain for translations fixed.
+- More git support added.
+
+0.1.0
+=====
+- The plugin is renamed to thunar-vcs-plugin.
+- All svn api functions are changed to both 1.5 and 1.6.
+- File selection dialog changed to work in more cases.
+- Limited git support added, but disabled.
+
+thunar-svn-plugin-0.0.3
+=======================
- All svn api functions changed to the 1.5 svn api. libsvn version 1.5 or
newer is now required.
-0.0.2
-=====
-- New Subversion actions have been added: switch, relocate, blame.
+thunar-svn-plugin-0.0.2
+=======================
+- New Subversion actions are added: switch, relocate, blame.
- File selection dialog added for various Subversion actions.
-0.0.1
-=====
+thunar-svn-plugin-0.0.1
+=======================
- Initial release of the Thunar SVN Plugin. This version of the Subversion
Plugin has suport for various Subversion action: add, checkout, cleanup,
commit, copy, delete, export, import, lock, log, move, properties, resolved,
diff --git a/README b/README
index d5296f8..63a2363 100644
--- a/README
+++ b/README
@@ -2,43 +2,51 @@ About Thunar VCS Plugin
=======================
The Thunar VCS Plugin adds Subversion actions to the context menu of thunar.
-This gives a VCS intergration to Thunar.
+This gives a VCS integration to Thunar.
The current features are:
-- Most of the svn action: add, checkout, cleanup, commit, copy, delete,
- export, import, lock, log, move, properties, resolved, revert, status,
- unlock, update.
+- Most of the svn action: add, blame, checkout, cleanup, commit, copy, delete,
+ export, import, lock, log, move, properties, relocate, resolved, revert,
+ status, switch, unlock, update.
- Subversion info in file properties dialog.
+- Basic git support: add, blame, branch, clean, clone, log, move, reset,
+ stash, status.
Usage
=====
In the thunar file/folder view right click on a file ore folder and the
-context menu pops up showing the SVN submenu. Choose the appropriate action.
+context menu pops up showing the SVN and GIT submenu. Choose the appropriate
+action.
Required packages
=================
-The Thunar SVN Plugin depends on the following packages:
+The Thunar VCS Plugin depends on the following packages:
- Thunar
- Thunar-VFS 0.4.0 or higher
- Thunarx 0.4.0 or higher
-- libsvn 1.5 or higher
-- libapr 0.9.7 or higher
- gtk 2.6.0 or higher
- glib 2.6.0 or higher
- gobject 2.6.0 or higher
+For svn support it requires the following packages:
+- libsvn 1.5 or higher
+- libapr 0.9.7 or higher
+
+For git support it requires the following packages:
+- git
+
Installation
============
-The file 'INSTALL' contains generic installation instructions. Make sure to
-run ./configure --prefix=$(pkg-config --variable prefix thunarx-1) so Thunar
-can find the plugin. For more information, visit the thunar-vcs-plugin website
-at http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
+The file 'INSTALL' contains generic installation instructions. To build the
+plugin xfce4-dev-tool version 4.7.2 or higher is required. For more
+information, visit the thunar-vcs-plugin website at
+http://goodies.xfce.org/projects/thunar-plugins/thunar-vcs-plugin
How to report bugs?
diff --git a/autogen.sh b/autogen.sh
index f56ecb7..f87947f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,26 +16,6 @@ EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 <<EOF
-autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
- or try to checkout again.
-EOF
- exit 1
-}
-
-# substitute revision and linguas
-linguas=`sed -e '/^#/d' po/LINGUAS`
-if test -d .git/svn; then
- revision=`LC_ALL=C git-svn find-rev HEAD`
-else
- revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n",$2}'`
-fi
-sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
- < "configure.ac.in" > "configure.ac"
-
-exec xdt-autogen $@
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.0" exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 3f7b74b..019223e 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,21 +11,21 @@ dnl ***************************
dnl *** Version information ***
dnl ***************************
m4_define([tvp_version_major], [0])
-m4_define([tvp_version_minor], [0])
-m4_define([tvp_version_micro], [4])
-m4_define([tvp_version_build], [r at REVISION@])
-m4_define([tvp_version_tag], [svn]) # Leave empty for releases
+m4_define([tvp_version_minor], [1])
+m4_define([tvp_version_micro], [2])
+m4_define([tvp_version_build], [@REVISION@])
+m4_define([tvp_version_tag], [git]) # Leave empty for releases
m4_define([tvp_version], [tvp_version_major().tvp_version_minor().tvp_version_micro()ifelse(tvp_version_tag(), [], [], [tvp_version_tag()-tvp_version_build()])])
dnl *******************************************
-dnl *** Debugging support for SVN snapshots ***
+dnl *** Debugging support for GIT snapshots ***
dnl *******************************************
-m4_define([tvp_debug_default], [ifelse(tvp_version_tag(), [svn], [yes], [minimum])])
+m4_define([tvp_debug_default], [ifelse(tvp_version_tag(), [git], [yes], [])])
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
-AC_COPYRIGHT([Copyright (c) 2006-2007 Peter de Ridder <peter at xfce.org>.])
+AC_COPYRIGHT([Copyright (c) 2006-2009 Peter de Ridder <peter at xfce.org>.])
AC_INIT([thunar-vcs-plugin], [tvp_version], [thunar-dev at xfce.org])
AC_PREFIX_DEFAULT([$(pkg-config --variable prefix thunarx-2 || echo /usr/local)])
AC_PREREQ([2.50])
@@ -56,6 +56,7 @@ dnl ********************************
AC_PROG_CC()
AC_PROG_LD()
AC_PROG_INSTALL()
+AC_PROG_INTLTOOL()
AM_PROG_CC_C_O()
dnl **************************
@@ -116,57 +117,12 @@ AM_CONDITIONAL([HAVE_GIT], [test x"$found_git" = x"yes"])
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
-AC_ARG_ENABLE([debug],
-AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes/full@:>@], [Turn on debugging @<:@default=tvp_debug_default@:>@]),
- [], [enable_debug=tvp_debug_default])
-AC_MSG_CHECKING([whether to enable debugging support])
-if test x"$enable_debug" = x"full" -o x"$enable_debug" = x"yes"; then
- dnl Check whether the compiler accepts the -fno-strict-aliasing
- dnl switch, as certain packages - like Glib - still don't work
- dnl properly with newer compilers.
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -fno-strict-aliasing"
- AC_MSG_CHECKING([whether $CC accepts -fno-strict-aliasing])
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([int x;]), [
- AC_MSG_RESULT([yes])
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -fno-strict-aliasing"
- ], [
- AC_MSG_RESULT([no])
- ])
- CFLAGS="$save_CFLAGS"
-
- dnl Make sure we detect possible errors
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -Werror -Wall"
-
- dnl Paranoia for --enable-debug=full
- if test x"$enable_debug" = x"full"; then
- PLATFORM_CFLAGS="$PLATFORM_CFLAGS -O0 -g3"
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_DEPRECATED -DG_ENABLE_DEBUG"
- fi
-else
- dnl Disable object cast checks
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
-
- dnl Disable all checks for --enable-debug=no
- if test x"$enable_debug" = x"no"; then
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
- fi
-fi
-AC_MSG_RESULT([$enable_debug])
+XDT_FEATURE_DEBUG([tvp_debug_default])
dnl **************************************
dnl *** Check for linker optimizations ***
dnl **************************************
-AC_MSG_CHECKING([whether $LD accepts -O1])
-case `$LD -O1 -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -Wl,-O1"
- AC_MSG_RESULT([yes])
- ;;
-*)
- AC_MSG_RESULT([no])
- ;;
-esac
+XDT_FEATURE_LINKER_OPTS()
dnl *********************************
dnl *** Substitute platform flags ***
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 2b7081f..0a8ad3a 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,8 +1,9 @@
-
-appsdir = $(datadir)/icons/hicolor/16x16/apps
-apps_DATA =
+iconsdir = $(datadir)/icons/hicolor/48x48/apps
+icons_DATA = \
+ git.png \
+ subversion.png
EXTRA_DIST = \
- $(apps_DATA)
+ $(icons_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/16x16/git.png b/icons/16x16/git.png
new file mode 100644
index 0000000..884b0f5
Binary files /dev/null and b/icons/16x16/git.png differ
diff --git a/icons/16x16/subversion.png b/icons/16x16/subversion.png
new file mode 100644
index 0000000..5967393
Binary files /dev/null and b/icons/16x16/subversion.png differ
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index 0b67da7..c3cae5f 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,7 +1,9 @@
iconsdir = $(datadir)/icons/hicolor/24x24/apps
icons_DATA = \
+ git.png \
subversion.png
EXTRA_DIST = \
$(icons_DATA)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/24x24/git.png b/icons/24x24/git.png
new file mode 100644
index 0000000..4cbd8b1
Binary files /dev/null and b/icons/24x24/git.png differ
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 795c901..0a8ad3a 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,7 +1,9 @@
iconsdir = $(datadir)/icons/hicolor/48x48/apps
icons_DATA = \
+ git.png \
subversion.png
EXTRA_DIST = \
$(icons_DATA)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/48x48/git.png b/icons/48x48/git.png
new file mode 100644
index 0000000..9993381
Binary files /dev/null and b/icons/48x48/git.png differ
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5ea9f26..e54e2d8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,35 @@
thunar-vcs-plugin/thunar-vcs-plugin.c
+thunar-vcs-plugin/tvp-git-action.c
thunar-vcs-plugin/tvp-provider.c
thunar-vcs-plugin/tvp-svn-action.c
-thunar-vcs-plugin/tvp-svn-property-page.c
thunar-vcs-plugin/tvp-svn-backend.c
+thunar-vcs-plugin/tvp-svn-property-page.c
+tvp-git-helper/main.c
+tvp-git-helper/tgh-add.c
+tvp-git-helper/tgh-blame.c
+tvp-git-helper/tgh-blame-dialog.c
+tvp-git-helper/tgh-branch.c
+tvp-git-helper/tgh-branch-dialog.c
+tvp-git-helper/tgh-clean.c
+tvp-git-helper/tgh-clean-dialog.c
+tvp-git-helper/tgh-clone.c
+tvp-git-helper/tgh-common.c
+tvp-git-helper/tgh-dialog-common.c
+tvp-git-helper/tgh-file-selection-dialog.c
+tvp-git-helper/tgh-log.c
+tvp-git-helper/tgh-log-dialog.c
+tvp-git-helper/tgh-move.c
+tvp-git-helper/tgh-notify-dialog.c
+tvp-git-helper/tgh-reset.c
+tvp-git-helper/tgh-stash.c
+tvp-git-helper/tgh-stash-dialog.c
+tvp-git-helper/tgh-status.c
+tvp-git-helper/tgh-status-dialog.c
+tvp-git-helper/tgh-transfer-dialog.c
tvp-svn-helper/main.c
tvp-svn-helper/tsh-add.c
-tvp-svn-helper/tsh-blame-dialog.c
tvp-svn-helper/tsh-blame.c
+tvp-svn-helper/tsh-blame-dialog.c
tvp-svn-helper/tsh-checkout.c
tvp-svn-helper/tsh-cleanup.c
tvp-svn-helper/tsh-commit.c
@@ -18,35 +41,25 @@ tvp-svn-helper/tsh-export.c
tvp-svn-helper/tsh-file-dialog.c
tvp-svn-helper/tsh-file-selection-dialog.c
tvp-svn-helper/tsh-import.c
-tvp-svn-helper/tsh-lock-dialog.c
tvp-svn-helper/tsh-lock.c
-tvp-svn-helper/tsh-log-dialog.c
-tvp-svn-helper/tsh-log-message-dialog.c
+tvp-svn-helper/tsh-lock-dialog.c
tvp-svn-helper/tsh-log.c
+tvp-svn-helper/tsh-log-dialog.c
tvp-svn-helper/tsh-login-dialog.c
+tvp-svn-helper/tsh-log-message-dialog.c
tvp-svn-helper/tsh-move.c
tvp-svn-helper/tsh-notify-dialog.c
-tvp-svn-helper/tsh-properties-dialog.c
tvp-svn-helper/tsh-properties.c
-tvp-svn-helper/tsh-relocate-dialog.c
+tvp-svn-helper/tsh-properties-dialog.c
tvp-svn-helper/tsh-relocate.c
+tvp-svn-helper/tsh-relocate-dialog.c
tvp-svn-helper/tsh-resolved.c
tvp-svn-helper/tsh-revert.c
-tvp-svn-helper/tsh-status-dialog.c
tvp-svn-helper/tsh-status.c
+tvp-svn-helper/tsh-status-dialog.c
tvp-svn-helper/tsh-switch.c
tvp-svn-helper/tsh-transfer-dialog.c
+tvp-svn-helper/tsh-tree-common.c
tvp-svn-helper/tsh-trust-dialog.c
tvp-svn-helper/tsh-unlock.c
tvp-svn-helper/tsh-update.c
-tvp-git-helper/main.c
-tvp-git-helper/tgh-add.c
-tvp-git-helper/tgh-branch-dialog.c
-tvp-git-helper/tgh-branch.c
-tvp-git-helper/tgh-common.c
-tvp-git-helper/tgh-dialog-common.c
-tvp-git-helper/tgh-file-selection-dialog.c
-tvp-git-helper/tgh-reset-dialog.c
-tvp-git-helper/tgh-reset.c
-tvp-git-helper/tgh-status-dialog.c
-tvp-git-helper/tgh-status.c
diff --git a/po/ar.po b/po/ar.po
index 6019836..377fe72 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2008-07-15 16:14+0200\n"
"Last-Translator: Mohamed Magdy <mohamedmk at gmail.com>\n"
"Language-Team: Arabeyes <doc at arabeyes.org>\n"
@@ -11,303 +11,463 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Arabic\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
+msgid "Menu|Add"
msgstr ""
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
+msgid "Add"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298
-msgid "Menu|Add"
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Menu|Bisect"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
-msgid "Add"
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+msgid "Menu|Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+msgid "Menu|Clean"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+msgid "Clean"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+msgid "Menu|Clone"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:335
-msgid "Menu|Copy"
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
-msgid "Copy"
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:340
-msgid "Menu|Delete"
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Menu|Fetch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
-msgid "Delete"
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Menu|Grep"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:350
-msgid "Menu|Export"
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Menu|Init"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
-msgid "Export"
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:355
-msgid "Menu|Import"
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
-msgid "Import"
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:360
-msgid "Menu|Info"
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+msgid "Menu|Merge"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:360
-msgid "Info"
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+msgid "Merge"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:370
-msgid "Menu|Lock"
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
-msgid "Lock"
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Menu|Pull"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Menu|Push"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+msgid "Menu|Rebase"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+msgid "Rebase"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+msgid "Menu|Reset"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+msgid "Menu|Remove"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+msgid "Remove"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Menu|Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+msgid "Menu|Stash"
+msgstr ""
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+msgid "Stash"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Menu|Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr ""
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr ""
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
+msgid "Menu|Copy"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
+msgid "Copy"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
+msgid "Menu|Delete"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
+msgid "Delete"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
+msgid "Menu|Export"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
+msgid "Export"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
+msgid "Menu|Import"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
+msgid "Import"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
+msgid "Menu|Info"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
+msgid "Info"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
+msgid "Menu|Lock"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
+msgid "Lock"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr ""
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr ""
@@ -320,556 +480,732 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr ""
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr ""
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr ""
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:103
+msgid "Execute clean action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:109
+msgid "Execute clone action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:133
+msgid "Execute stash action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+msgid "Clone Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:183
+msgid "Stash Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+msgid "Excldue ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+msgid "Include ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+msgid "Only ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+msgid "Clone finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:123
+msgid "Cloning ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+msgid "AuthorDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+msgid "CommitDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+msgid "Changes"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:58
+msgid "Move finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:151
+msgid "Move ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+msgid "Reset finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:143
+msgid "Reset ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr ""
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr ""
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr ""
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr ""
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr ""
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr ""
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr ""
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr ""
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr ""
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr ""
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr ""
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr ""
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr ""
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr ""
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr ""
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr ""
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr ""
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr ""
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr ""
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr ""
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr ""
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr ""
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr ""
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr ""
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr ""
@@ -879,8 +1215,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -890,8 +1226,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr ""
@@ -901,146 +1237,75 @@ msgstr ""
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr ""
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
msgstr ""
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:71
-msgid "Relocate failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:86
-msgid "Relocate finished"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:128
-msgid "Relocating ..."
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr ""
-
-#: tvp-git-helper/main.c:77
-msgid "Execute branch action"
-msgstr ""
-
-#: tvp-git-helper/main.c:83
-msgid "Execute reset action"
-msgstr ""
-
-#: tvp-git-helper/main.c:102
-msgid "Branch Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-msgid "Reset Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-msgid "Reset"
-msgstr ""
-
-#: tvp-git-helper/tgh-add.c:58
-msgid "Add finished"
-msgstr ""
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
diff --git a/po/ca.po b/po/ca.po
index e337653..42198e5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,13 +2,15 @@
# Copyright (C) 2007 THE thunar-svn-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the thunar-svn-plugin package.
# Harald Servat <redcrash at gmail.com>, 2009
+# Carles Muñoz Gorriz <carlesmu at internautas.org>, 2009
+#
msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: \n"
-"Last-Translator: Harald Servat <redcrash at gmail.com>\n"
+"Last-Translator: Carles Muñoz Gorriz <carlesmu at internautas.org>\n"
"Language-Team: Harald Servat <redcrash at gmail.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -16,303 +18,485 @@ msgstr ""
"X-Poedit-Language: Catalan\n"
"X-Poedit-Country: Spain\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
-msgstr "Afegir"
+msgstr "Afegeix"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Afegir"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Culpa"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
-msgstr "Culpar"
+msgstr "Culpa"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Culpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "Llista de canvis"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "Branca"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Llista de canvis"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Branca"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
-msgstr "Obtenir"
+msgstr "Obté"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Obtenir"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
-msgstr "Netejar"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
+msgstr "Neteja"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Netejar"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copia"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
-msgstr "Confirmació"
+msgstr "Publica"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
-msgstr "Confirmació"
+msgstr "Publicar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diferències"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diferències"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Canvia"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Neteja"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Informació"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Infinitat"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Registre"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Registre"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Mou"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Fusionat"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Mou"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Moure"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Culpa"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Estat"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Resol"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Reiniciar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Restitueix"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Resol"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resoldre"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Registre"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Estat"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Estat"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Estat"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Estat"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Registre"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "L'acció %s no està implementada"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Llista de canvis"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Llista de canvis"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Neteja"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Netejar"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
-msgstr "Copiar"
+msgstr "Copia"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
-msgstr "Esborrar"
+msgstr "Esborra"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Esborrar"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diferències"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diferències"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
-msgstr "Exportar"
+msgstr "Exporta"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
-msgstr "Importar"
+msgstr "Importa"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Informació"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informació"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
-msgstr "Bloquejar"
+msgstr "Bloqueja"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Bloquejar"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Registre"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Registre"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Moure"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Moure"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
-msgstr "Editar propietats"
+msgstr "Edita les propietats"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
-msgstr "Editar propietats"
+msgstr "Editar les propietats"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
-msgstr "Deslocalitzar"
+msgstr "Re-ubica"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
-msgstr "Deslocalitzar"
+msgstr "Re-ubicar"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Resolt"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resolt"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
-msgstr "Resoldre"
+msgstr "Resol"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resoldre"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
-msgstr "Restituir"
+msgstr "Restitueix"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Restituir"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Estat"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Estat"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
-msgstr "Canviar"
+msgstr "Canvia"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Canviar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
-msgstr "Desbloquejar"
+msgstr "Desbloqueja"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Desbloquejar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
-msgstr "Actualitzar"
+msgstr "Actualitza"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Actualitzar"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "L'acció %s no està implementada"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Desconegut"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revisió:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
-msgstr "Repositori:"
+msgstr "Diposit:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
-msgstr "Revisió de modificació:"
+msgstr "Revisió modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Data de modificació:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Llista de canvis:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Profunditat:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
-msgstr "Excloure"
+msgstr "Exclouu"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "Buit"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Fitxers"
@@ -325,565 +509,749 @@ msgstr "Fitxers"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "Immediats"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "Infinitat"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
-msgstr "Imprimir informació de la versió"
+msgstr "Mostra informació de la versió"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
-msgstr "Executar l'acció d'afegir"
+msgstr "Executa l'acció d'afegir"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
-msgstr "Executar l'acció de culpar"
+msgstr "Executa l'acció de culpar"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr "Executa acció de branca"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Executa l'acció de netejar"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Executa l'acció de registre"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Executa l'acció de registre"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Executa l'acció de moure"
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr "Executa acció de reiniciar"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Executar l'acció d'estat"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Executar l'acció d'estat"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Opcions relacionades amb afegir:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Opcions relatives a culpar:"
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr "Opcions relatives a la branca:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Opcions relatives a copiar:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Opcions relatives al registre:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Opcions relatives a moure: "
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr "Opcions relatives a reiniciar:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Opcions relatives a l'estat:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Opcions relatives a l'estat:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Línia"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revisió"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Data"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Camí"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Mostrar els fitxers ignorats"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Mostrar els fitxers ignorats"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Mostrar els fitxers ignorats"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "La neteja ha finalitzat"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Netejant ..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Fallat"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr "sense seguiment"
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Selecciona tot/cap"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Publicar"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Missatge"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Canviat"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Fitxer"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "La neteja ha finalitzat"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Mou a"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Moure"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Acció"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "La re-ubicació ha finalitzat"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Reiniciar"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nom"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repositori:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Seleccioneu una carpeta"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "D_irectori:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Transferència"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
-msgstr "Executar l'acció de llista de canvis"
+msgstr "Executa l'acció de llista de canvis"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
-msgstr "Executar l'acció d'obtenir"
+msgstr "Executa l'acció d'obtenir"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
-msgstr "Executar l'acció de netejar"
+msgstr "Executa l'acció de netejar"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
-msgstr "Executar l'acció de confirmar"
+msgstr "Executa l'acció de publicar"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
-msgstr "Executar l'acció de copiar"
+msgstr "Executa l'acció de copiar"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
-msgstr "Executar l'acció d'esborrar"
+msgstr "Executa l'acció d'esborrar"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
-msgstr "Executar l'acció d'exportar"
+msgstr "Executa l'acció d'exportar"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
-msgstr "Executar l'acció d'importar"
+msgstr "Executa l'acció d'importar"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
-msgstr "Executar l'acció de bloquejar"
-
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Executar l'acció de registre"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Executar l'acció de moure"
+msgstr "Executa l'acció de bloquejar"
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
-msgstr "Executar l'acció de propietats"
+msgstr "Executa l'acció de propietats"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
-msgstr "Executar l'acció de resoldre"
+msgstr "Executa l'acció de resoldre"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
-msgstr "Executar l'acció de deslocalitzar"
+msgstr "Executa l'acció de re-ubicar"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
-msgstr "Executar l'acció de restituir"
+msgstr "Executa l'acció de restituir"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Executar l'acció d'estat"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Executar l'acció de canviar"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Executar l'acció de desbloquejar"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Executar l'acció d'actualitzar"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Opcions relacionades amb afegir:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Opcions relatives a culpar:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "Opcions relatives a la llista de canvis:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Opcions relatives a obtenir:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Opcions relatives a netejar:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
-msgstr "Opcions relatives a confirmar:"
+msgstr "Opcions relatives a publicar:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Opcions relatives a copiar:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Opcions relatives a copiar:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Opcions relatives a exportar:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Opcions relatives a importar:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Opcions relatives a bloquejar:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Opcions relatives al registre:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Opcions relatives a moure: "
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Opcions relatives a les propietats:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Propietats"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Opcions relatives a resoldre:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
-msgstr "Opcions relatives a deslocalitzar:"
+msgstr "Opcions relatives a re-ubicar:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Opcions relacionades amb restituir:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Opcions relatives a l'estat:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Opcions relatives a canviar:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Opcions relatives a desbloquejar:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Opcions relatives a actualitzar:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Falten paràmetres"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Fallat"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Línia"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revisió"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Data"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "No s'ha pogut culpar"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "No s'ha pogut netejar"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "La neteja ha finalitzat"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Netejant ..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "En la revisió: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Res a fer"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Completat"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
-msgstr "Missatge de confirmació"
+msgstr "Missatge de publicació"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
-msgstr ""
+msgstr "Desa la contrasenya com a text pla"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Afegit"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Copiat"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Esborrat"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Restaurat"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Restituït"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "No s'ha pogut restituir"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Omès"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Actualitzat"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Extern"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Modificat"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Substituït"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Transmetent"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Bloquejat"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Desbloquejat"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "No s'ha pogut bloquejar"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "No s'ha pogut desbloquejar"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Existeix"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "Llista de canvis establerta"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "Llista de canvis buida"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "Llista de canvis moguda"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "Iniciant fusió"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "Iniciant fusió forana"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Substituir"
-#: tvp-svn-helper/tsh-common.c:527
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
-msgstr "Han fallat les propietats"
+msgstr "Propietat afegida"
-#: tvp-svn-helper/tsh-common.c:528
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
-msgstr "Han fallat les propietats"
+msgstr "Propietat modificada"
-#: tvp-svn-helper/tsh-common.c:529
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
-msgstr "Han fallat les propietats"
+msgstr "Propietat esborrada"
-#: tvp-svn-helper/tsh-common.c:530
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
-msgstr "Propietats"
+msgstr "Propietat inexistent"
-#: tvp-svn-helper/tsh-common.c:531
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
-msgstr "No s'ha pogut establir la propietat"
+msgstr "Propietat de revisió fixada"
-#: tvp-svn-helper/tsh-common.c:532
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
-msgstr "No s'ha pogut establir la propietat"
+msgstr "Propietat de revisió esborrada"
-#: tvp-svn-helper/tsh-common.c:533
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
-msgstr "Completat"
+msgstr "Fusió completada"
-#: tvp-svn-helper/tsh-common.c:534
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
-msgstr "Està en conflicte"
+msgstr "Conflicte d'arbre"
-#: tvp-svn-helper/tsh-common.c:535
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
-msgstr "Extern"
+msgstr "Fallida externa"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Inaplicable"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "No modificat"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Desaparegut"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Obstruït"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Canviat"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Fusionat"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Està en conflicte"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignorat"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incomplet"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Còpia local"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
-msgstr "Copiar a"
+msgstr "Copia a"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Esborrar local"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Missatge d'esborrat"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificat:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Seleccioneu un fitxer"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
-msgstr "Recordar"
+msgstr "Recorda"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificat"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Camí"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Selecciona tot/cap"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Missatge d'importació"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Missatge"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Acció"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Fitxer"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Estat"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Missatge del registre"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "No s'ha pogut registrar"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Usuari:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Contrasenya:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Inici de sessió"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Estat"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Missatge del registre"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Moviment local"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Moure a"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipus MIME"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificació"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nom"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "No s'ha pogut establir la propietat"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Han fallat les propietats"
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Valor"
@@ -893,10 +1261,10 @@ msgstr "Valor"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
-msgstr "Propi"
+msgstr "Només ell"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are updated
@@ -904,8 +1272,8 @@ msgstr "Propi"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "Fitxers immediats"
@@ -915,152 +1283,89 @@ msgstr "Fitxers immediats"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "Recursiu"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "No s'ha pogut establir la propietat"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
+msgstr "La re-ubicació ha fallat"
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Han fallat les propietats"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
+msgstr "La re-ubicació ha finalitzat"
+
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
+msgstr "Re-ubicant…"
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
msgid "_From:"
msgstr "_De:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Seleccioneu una carpeta"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr "_A:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "D_irectori:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
-msgid "Relocate failed"
-msgstr "La deslocalització ha fallat"
-
-#: tvp-svn-helper/tsh-relocate.c:86
-msgid "Relocate finished"
-msgstr "La deslocalització ha finalitzat"
-
-#: tvp-svn-helper/tsh-relocate.c:128
-msgid "Relocating ..."
-msgstr "Deslocalitzant ..."
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "L'estat ha fallat"
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Mostrar els fitxers no modificats"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Mostrar els fitxers sense versió"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Mostrar els fitxers ignorats"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Ocultar els externs"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Comprovar repositori"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "L'estat ha fallat"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repositori:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Transferència"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "El certificat no és vàlid encara."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "El certificat ha expirat."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "El certificat no es correspon amb l'ordinador central."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "L'autoritat del certificat és desconeguda."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
-msgstr "Un altre tipus d'error."
+msgstr "Un altre error."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Confiança"
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Executar l'acció de culpar"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Executar l'acció de restituir"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Opcions relatives a culpar:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Opcions relacionades amb restituir:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
#, fuzzy
-msgid "Reset"
-msgstr "Restituir"
+#~ msgid "Execute remove action"
+#~ msgstr "Executa l'acció de moure"
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "La neteja ha finalitzat"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Opcions relatives a resoldre:"
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "S'ha acabar l'afegició"
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "S'està afegint…"
diff --git a/po/cs.po b/po/cs.po
index 47a520e..c521572 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce 4-i18-goodies\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2009-06-06 22:04+0100\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
+"PO-Revision-Date: 2009-10-25 11:38+0100\n"
"Last-Translator: Michal Várady <miko.vaji at gmail.com>\n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
@@ -16,303 +16,485 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Přidat (add)"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Přidat (add)"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Vypsat detaily (blame)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Vypsat detaily (blame)"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Vypsat detaily (blame)"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "Seznam změn"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "Větev"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Seznam změn"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Větev"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Stáhnout (checkout)"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Stáhnout (checkout)"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Vyčistit (cleanup)"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Vyčistit (cleanup)"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Zkopírovat (copy)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Zapsat (commit)"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Zapsat (commit)"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Rozdíl (diff)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Rozdíl (diff)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Přepnout (switch)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Vyčistit (cleanup)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Informace (info)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Nekonečná"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Protokol (log)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Protokol (log)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Přesunout (move)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Spojeno"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Přesunout (move)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Přesunout (move)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Vypsat detaily (blame)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Stav (status)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Vyřešit (resolve)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Resetování"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Obnovit předchozí (revert)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr "Resetování"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Vyřešit (resolve)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Vyřešit (resolve)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Protokol (log)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Stav (status)"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Stav (status)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Stav (status)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Stav (status)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Protokol (log)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Akce %s není implementovaná"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Seznam změn"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Seznam změn"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Vyčistit (cleanup)"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Vyčistit (cleanup)"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Zkopírovat (copy)"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Zkopírovat (copy)"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Smazat (delete)"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Smazat (delete)"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Rozdíl (diff)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Rozdíl (diff)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportovat (export)"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportovat (export)"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importovat (import)"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importovat (import)"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Informace (info)"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informace (info)"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Uzamknout (lock)"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Uzamknout (lock)"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Protokol (log)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Protokol (log)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Přesunout (move)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Přesunout (move)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Upravit vlastnosti (propedit)"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Upravit vlastnosti (propedit)"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Přemístit (relocate)"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Přemístit (relocate)"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Vyřešeno (resolved)"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Vyřešeno (resolved)"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Vyřešit (resolve)"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Vyřešit (resolve)"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Obnovit předchozí (revert)"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Obnovit předchozí (revert)"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Stav (status)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Stav (status)"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Přepnout (switch)"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Přepnout (switch)"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Odemknout (unlock)"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Odemknout (unlock)"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Aktualizovat (update)"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Aktualizovat (update)"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Akce %s není implementovaná"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "Adresa URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Neznámá"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revize:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repozitář:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Revize změny:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Datum změny:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Seznam změn:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Hloubka:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "Nezahrnout"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "Prázdná"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Soubory"
@@ -325,556 +507,749 @@ msgstr "Soubory"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "Tento soubor nebo adresář a v něm obsažené soubury a adresáře"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "Nekonečná"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Vypíše informaci o verzi"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Spustit akci přidání (add)"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Spustit akci vypsání detailů (blame)"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr "Spustit akci větvení (branch)"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Spustit akci vyčištění (clean)"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Spustit akci protokolování (log)"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Spustit akci protokolování (log)"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Spustit akci přesunu (move)"
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr "Spustit akci resetování (reset)"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Spustit akci stavu (status)"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Spustit akci stavu (status)"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Volby týkající se přidávání (add):"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Volby týkající se výpisu detailů (blame):"
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr "Volby týkající se větvení (branch):"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Volby týkající se kopírování (copy):"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Volby týkající se protokolování (log):"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Volby týkající se přesunu (move):"
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr "Volby týkající se resetování (reset):"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Volby týkající se stavu (status):"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Volby týkající se stavu (status):"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Čára"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revize"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Datum"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Cesta"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Zobrazit ignorované soubory"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Zobrazit ignorované soubory"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Zobrazit ignorované soubory"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Čištění ukončeno"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Čistí se..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Selhal"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr "nesledovaný"
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Vybrat vše nebo zrušit výběr"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Zapsat (commit)"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Zpráva"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Změněno"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Soubor"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Čištění ukončeno"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Přesunout do umístění"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Přesunout (move)"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Akce"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Přemisťování dokončeno"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Resetování"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Název"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repozitář:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Vyberte složku"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Adresář:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Přenos"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "Spustí akci seznam změn"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Spustí akci stažení (checkout)"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Spustit akci vyčištění (clean)"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Spustit akci odeslání (commit)"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Spustit akci kopírování (copy)"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Spustit akci mazání (delete)"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Spustit akci exportu (export)"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Spustit akci importu (import)"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Spustit akci uzamknutí (lock)"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Spustit akci protokolování (log)"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Spustit akci přesunu (move)"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Spustit akci vlastností (propedit)"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Spustit akci vyřešení (resolved)"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Spustit akci přemístění (relocate)"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Spustit akci obnovení (revert)"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Spustit akci stavu (status)"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Spustit akci přepnutí (switch)"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Spustit akci odemknutí (unlock)"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Spustit akci aktualizace (update)"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Volby týkající se přidávání (add):"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Volby týkající se výpisu detailů (blame):"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "Volby týkající se seznamu změn:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Volby týkající se stahování (checkout):"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Volby týkající se čištění (cleanup):"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Volby týkající se zapisování (checkin):"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Volby týkající se kopírování (copy):"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Volby týkající se mazání (delete):"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Volby týkající se exportování (export):"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Volby týkající se importování (import):"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Volby týkající se uzamykání (lock):"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Volby týkající se protokolování (log):"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Volby týkající se přesunu (move):"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Volby týkající se vlastností (propedit:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Vlastnosti"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Volby týkající se řešení (resolved):"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Volby týkající se přemístění (relocate):"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Volby týkající se obnovování (revert):"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Volby týkající se stavu (status):"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Volby týkající se přepnutí (switch):"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Volby týkající se odemykání (unlock):"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Volby týkající se aktualizace (update):"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Nedostatek argumentů"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Selhal"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Čára"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revize"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Datum"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Výpis detailů se nezdařil"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Čištění se nezdařilo"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Čištění ukončeno"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Čistí se..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Na revizi: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Žádné úlohy"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Dokončeno"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Odeslat zprávu"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr "Uložit heslo jako prostý text?"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Přidáno"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Zkopírováno"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Smazáno"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Obnoveno"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Předchozí obnoveno"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Obnovení předchozího se nezdařilo"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Vynecháno"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Aktualizováno"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Externí"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Pozměněno"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Nahrazeno"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Přenáší se"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Uzamčeno"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Odemčeno"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Uzamknutí se nezdařilo"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Odemknutí se nezdařilo"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Existuje"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "Sada seznamu změn"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "Seznam změn vyprázdněn"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "Seznam změn přesunut"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "Zahájení slučování"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "Zahájení vzdáleného slučování"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Nahradit"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
msgstr "Vlastnost přidána"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
msgstr "Vlastnosti změněny"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
msgstr "Vlastnost smazána"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
msgstr "Neexistující vlastnost"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr "Nastavena vlastnost revize"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr "Smazána vlastnost revize"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
msgstr "Sloučení dokončeno"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
msgstr "Konfikt ve stromu"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
msgstr "Externí selhal"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Nepoužitelné"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Nezměněno"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Chybí"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Zabráněno"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Změněno"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Spojeno"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "V konfliktu"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Běžný"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignorováno"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Nedokončeno"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Místní kopie"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Kopírovat do umístění"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Smazat místní kopii"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Smazat zprávu"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certifikát:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Vyberte soubor"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Zapamatovat si"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certifikát"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Cesta"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Vybrat vše nebo zrušit výběr"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Vložit zprávu"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Zpráva"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Akce"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Soubor"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Stav"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Zpráva záznamu"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Záznam se nezdařil"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Uživatelské jméno:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Heslo"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Přihlásit se"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Stav"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Zpráva záznamu"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Místní přesun"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Přesunout do umístění"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Typ MIME"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Oznámení"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Název"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Nastavení vlastnosti se nezdařilo"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Vlastnosti selhaly"
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Hodnota"
@@ -884,8 +1259,8 @@ msgstr "Hodnota"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "Pouze tato položka"
@@ -895,8 +1270,8 @@ msgstr "Pouze tato položka"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "Tento soubor nebo adresář a soubory v něm obsažené"
@@ -906,155 +1281,84 @@ msgstr "Tento soubor nebo adresář a soubory v něm obsažené"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "Rekurzivně"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Nastavení vlastnosti se nezdařilo"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Vlastnosti selhaly"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_Z:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Vyberte složku"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Do:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Adresář:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Přemisťování se nezdařilo"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Přemisťování dokončeno"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Přemisťování..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_Z:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Do:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Stav selhal"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Zobrazit nepozměněné soubory"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Zobrazit soubory bez verze"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Zobrazit ignorované soubory"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Skrýt externí"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Ověřit repozitář"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Stav selhal"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repozitář:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Přenos"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Platnost certifikátu ještě nenastala."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Platnost certifikátu vypršela."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "Certifikát neodpovídá vzdálenému hostiteli."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "Certifikační autorita je neznámá."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Jiná chyba."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Důvěřovat"
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Spustit akci vypsání detailů (blame)"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Spustit akci obnovení (revert)"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Volby týkající se výpisu detailů (blame):"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Volby týkající se obnovování (revert):"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Obnovit předchozí (revert)"
+#~ msgid "Add finished"
+#~ msgstr "Přidání ukončeno"
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Čištění ukončeno"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "Přidávání..."
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s na serveru %2$s"
diff --git a/po/da.po b/po/da.po
index 6a151f4..6c437d8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin 0.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2009-05-01 13:18+0100\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
+"PO-Revision-Date: 2009-08-19 23:52+0100\n"
"Last-Translator: Per Kongstad <p_kongstad at op.pl>\n"
"Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
"MIME-Version: 1.0\n"
@@ -18,305 +18,489 @@ msgstr ""
"X-Poedit-Country: DENMARK\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Tilføj"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Tilføj"
# http://svnbook.red-bean.com/en/1.0/re02.html
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Vis ansvarlige"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+# http://svnbook.red-bean.com/en/1.0/re02.html
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Vis ansvarlige"
# http://svnbook.red-bean.com/en/1.0/re02.html
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Vis ansvarlige"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "Ændringsliste"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "Gren"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Ændringsliste"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Gren"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Tjek ud"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Tjek ud"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Oprydning"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Oprydning"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Kopiér"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Integrér"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Integrér"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Skift"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Oprydning"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Info"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Evighed"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Flyt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Sammenføjet"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Flyt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Flyt"
+
+# http://svnbook.red-bean.com/en/1.0/re02.html
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Vis ansvarlige"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Løs"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Nulstil"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Forkast"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr "Nulstil"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Løs"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Løs"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Handling %s er ikke implementeret"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Ændringsliste"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Ændringsliste"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Oprydning"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Oprydning"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Kopiér"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Kopiér"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Slet"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Slet"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Eksportér"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Eksportér"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importér"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importér"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Lås"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Lås"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Flyt"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Flyt"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Redigér egenskaber"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Redigér egenskaber"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Skift adresse"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Skift adresse"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Løst"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Løst"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Løs"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Løs"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Forkast"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Forkast"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Skift"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Skift"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Lås op"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Lås op"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Opdatér"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Opdatér"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Handling %s er ikke implementeret"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Ukendt"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revision:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Arkiv:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Ændret revision:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Ændret dato:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Forfatter:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Ændringsliste:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Dybde:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "Udeluk"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "Tom"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Filer"
@@ -329,556 +513,749 @@ msgstr "Filer"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "Umiddelbare"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "Evighed"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Udskriv versionsinformation"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Kør handlingen tilføj"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Kør anklagehandling"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr "Kør grenhandling"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Kør rydophandling"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Kør loghandling"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Kør loghandling"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Kør flyttehandling"
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr "Kør nulstilhandling"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Kør statushandling"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Kør statushandling"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Tilføj-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Anklag-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr "Gren-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Kopiér-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Log-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Flytte-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr "Nulstil-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Status-relaterede tilvalg:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Status-relaterede tilvalg:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Linje"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revision"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Forfatter"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Dato"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Sti"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Vis ignorede filer"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Vis ignorede filer"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Vis ignorede filer"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Oprydning afsluttet"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Rydder op ..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Fejlede"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr "uden revisionsspor"
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Markér/afmarkér alle"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Forfatter"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Integrér"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Besked"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Ændret"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Fil"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Oprydning afsluttet"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Flyt til"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Flyt"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Handling"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Adresseskift afsluttet"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Nulstil"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Navn"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Arkiv:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Vælg mappe"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Katalog:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Overførsel"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "Udfør ændringshandling"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Udfør tjekudhandling"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Kør rydophandling"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Kør integrérhandling"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Kør kopiérhandling"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Kør slettehandling"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Kør eksportérhandling"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Kør importérhandling"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Kør låsehandling"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Kør loghandling"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Kør flyttehandling"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Kør egenskabshandling"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Kør løsehandling"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Kør adresseskifthandling"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Kør forkastehandling"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Kør statushandling"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Kør skiftehandling"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Kør låsophandling"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Udfør opdatérhandling"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Tilføj-relaterede tilvalg:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Anklag-relaterede tilvalg:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "Tilvalg relateret til ændringsliste:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Tjekud-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Rydop-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Integrér-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Kopiér-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Slette-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Eksportér-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Importér-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Låse-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Log-relaterede tilvalg:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Flytte-relaterede tilvalg:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Egenskab-relaterede tilvalg:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Egenskaber"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Løs-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Adresseskift-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Forkast-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Status-relaterede tilvalg:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Skifte-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Låsop-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Opdatér-relaterede tilvalg:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "For få parametre angivet"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Fejlede"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Linje"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revision"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Forfatter"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Dato"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Anklag fejlede"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Oprydning fejlede"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Oprydning afsluttet"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Rydder op ..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Ved revision: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Intet at udføre"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Fuldført"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Integrérbesked"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr "Gemme adgangskode i klartekst?"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Tilføjet"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Kopieret"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Slettet"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Genoprettet"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Forkastet"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Forkastning fejlede"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Udeladt"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Opdateret"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Ekstern"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Ændret"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Erstattet"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Overfører"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Låst"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Ikke låst"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Låsning fejlede"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Oplåsning fejlede"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Findes"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "Ændringsliste indstillet"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "Ændringsliste ryddet"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "Ændringsliste flyttet"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "Fletning begynd"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "Ekstern fletning begynd"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Erstat"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
msgstr "Egenskab tilføjet"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
msgstr "Egenskab ændret"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
msgstr "Egenskab slettet"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
msgstr "Egenskab findes ikke"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr "Indstillet egenskabversion"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr "Egenskabversion slettet"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
msgstr "Fletning gennemført"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
msgstr "Trækonflikt"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
msgstr "Ekstern fejlede"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Upassende"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Uændret"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Mangler"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Spærret"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Ændret"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Sammenføjet"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "I konflikt"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignoreret"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Ufuldstændig"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Lokal kopi"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Kopiér til"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Lokal sletning"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Slettebesked"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certifikat:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Vælg en fil"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Husk"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certifikat"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Sti"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Markér/afmarkér alle"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Importbesked"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Besked"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Handling"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Fil"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Tilstand"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Logbesked"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Log fejlede"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Brugernavn:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Adgangskode:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Logind"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Tilstand"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Logbesked"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Lokal flytning"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Flyt til"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime-type"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Påmindelse"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Navn"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Indstilling af egenskab fejlede"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Egenskaber fejlede"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Værdi"
@@ -888,8 +1265,8 @@ msgstr "Værdi"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "Aktuelle"
@@ -899,8 +1276,8 @@ msgstr "Aktuelle"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "Umiddelbare filer"
@@ -910,155 +1287,92 @@ msgstr "Umiddelbare filer"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "Rekursivt"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Indstilling af egenskab fejlede"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Egenskaber fejlede"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_Fra:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Vælg mappe"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Til:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Katalog:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Skift adresse fejlede"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Adresseskift afsluttet"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Skifter adresse ..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_Fra:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Til:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status fejlede"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Vis uændrede filer"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Vis ikkeversionerede filer"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Vis ignorede filer"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Skjul eksterne"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Tjek arkiv"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Status fejlede"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Arkiv:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Overførsel"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Certifikat er endnu ikke gyldigt."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Certifikatet er udløbet."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "Certifikat stemmer ikke overens med fjernmaskinens værtsnavn."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "Certifikat-autoriteten er ukendt."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Anden fejl."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Stol på"
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Kør anklagehandling"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Kør forkastehandling"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Anklag-relaterede tilvalg:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Forkast-relaterede tilvalg:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
#, fuzzy
-msgid "Reset"
-msgstr "Forkast"
+#~ msgid "Execute remove action"
+#~ msgstr "Kør flyttehandling"
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "Oprydning afsluttet"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Løs-relaterede tilvalg:"
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Tilføj afsluttet"
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "Tilføjer..."
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s på %2$s"
diff --git a/po/de.po b/po/de.po
index fd2b736..feae0b8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-04-14 23:02+0200\n"
"Last-Translator: Fabian Nowak <timystery at arcor.de>\n"
"Language-Team: German\n"
@@ -17,303 +17,486 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Hinzufügen"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Hinzufügen"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Beschuldigen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Beschuldigen"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Beschuldigen"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "Änderungsliste"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "Beschuldigen"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Änderungsliste"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Auschecken"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Auschecken"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Aufräumen"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Aufräumen"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Kopieren"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Einchecken"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Einchecken"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Unterschiede"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Unterschiede"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Umschalten"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Aufräumen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Information"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Unendlich"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Verschieben"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Zusammengeführt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Verschieben"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Verschieben"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Beschuldigen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Auflösen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Rückgängig"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Rückgängig"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Rückgängig"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Auflösen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Auflösen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Aktion »%s« ist nicht implementiert"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Änderungsliste"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Änderungsliste"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Aufräumen"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Aufräumen"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Kopieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Kopieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Löschen"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Löschen"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Unterschiede"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Unterschiede"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Information"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Information"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Sperren"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Sperren"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Verschieben"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Verschieben"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Eigenschaften ändern"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Eigenschaften ändern"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Umplatzieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Umplatzieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Aufgelöst"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Aufgelöst"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Auflösen"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Auflösen"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Rückgängig"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Rückgängig"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Umschalten"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Umschalten"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Entsperren"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Entsperren"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Aktualisieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Aktualisieren"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Aktion »%s« ist nicht implementiert"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Unbekannt"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Version:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Ablage:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Geänderte Version:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Datum geändert:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Veränderungen:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Tiefe:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "Ausschließen"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "Leer"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Dateien"
@@ -326,565 +509,762 @@ msgstr "Dateien"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "Ab dieser Ebene"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "Unendlich"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Versionsinformationen ausgeben"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Aktion »Hinzufügen« ausführen"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Aktion »Beschuldigen« ausführen"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Aktion »Beschuldigen« ausführen"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Aktion »Aufräumen« ausführen"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Aktion »Log« ausführen"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Aktion »Log« ausführen"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Aktion »Verschieben« ausführen"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Aktion »Rückgängig« ausführen"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Aktion »Status« ausführen"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Aktion »Status« ausführen"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Optionen fürs Hinzufügen:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Optionen fürs Beschuldigen:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Optionen fürs Beschuldigen:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Optionen fürs Kopieren:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Optionen für Logs:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Optionen fürs Verschieben:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Optionen fürs Rückängigmachen:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Optionen für den Zustand:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Optionen für den Zustand:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Zeile"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Version"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Datum"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Pfad"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Ignorierte Dateien zeigen"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Ignorierte Dateien zeigen"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Ignorierte Dateien zeigen"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Aufräumen vollständig"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Räume auf ..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Alle auswählen/abwählen"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Einchecken"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Nachricht"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Verändert"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Datei"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Aufräumen vollständig"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Verschieben nach"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Verschieben"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Aktion"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Umplatzieren vollendet"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Rückgängig"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Name"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Ablage:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Wählen Sie einen Ordner"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Verzeichnis:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Übertragen"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "Aktion »Veränderungen« ausführen"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Aktion »Auschecken« ausführen"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Aktion »Aufräumen« ausführen"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Aktion »Einchecken« ausführen"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Aktion »Kopieren« ausführen"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Aktion »Löschen« ausführen"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Aktion »Exportieren« ausführen"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Aktion »Importieren« ausführen"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Aktion »Sperren« ausführen"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Aktion »Log« ausführen"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Aktion »Verschieben« ausführen"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Aktion »Eigenschaften« ausführen"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Aktion »Aufgelöst« ausführen"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Aktion »Umplatzieren« ausführen"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Aktion »Rückgängig« ausführen"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Aktion »Status« ausführen"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Aktion »Umschalten« ausführen"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Aktion »Entsperren« ausführen"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Aktion »Aktualisieren« ausführen"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Optionen fürs Hinzufügen:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Optionen fürs Beschuldigen:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "Optionen für die Änderungslisten:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Optionen fürs Auschecken:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Optionen fürs Aufräumen:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Optionen fürs Einchecken:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Optionen fürs Kopieren:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Optionen fürs Löschen:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Optionen fürs Exportieren:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Optionen fürs Importieren:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Optionen fürs Sperren:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Optionen für Logs:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Optionen fürs Verschieben:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Optionen für die Eigenschaften:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Eigenschaften"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Optionen für Aufgelöst:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Optionen fürs Umplatzieren:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Optionen fürs Rückängigmachen:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Optionen für den Zustand:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Optionen f+rs Umschalten:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Optionen fürs Entsperren:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Optionen für Updates:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Nicht genügend Argumente vorhanden"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Fehlgeschlagen"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Zeile"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Version"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Datum"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Beschuldigen fehlgeschlagen"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Aufräumen fehlgeschlagen"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Aufräumen vollständig"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Räume auf ..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Bei Version: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Nichts zu tun"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Vollständig"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Einchecknachricht"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Hinzugefügt"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Kopiert"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Gelöscht"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Wiederhergestellt"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Rückgängig gemacht"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Rpckgängigmachen fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Übersprungen"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Aktualisiert"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Extern"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Verändert"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Ersetzt"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Übertrage"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Gesperrt"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Entsperrt"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Sperren fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Entsperren fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Vorhanden"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "Änderungsliste eingestellt"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "Änderungsliste geleert"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "Änderungsliste verschoben"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "Zusammenführen beginnt"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "Zusammenführen mit fremder Datei beginnt"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Ersetzen"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Eigenschaften fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Eigenschaften fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Eigenschaften fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Eigenschaften"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Das Setzen der Eigenschaften ist fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Das Setzen der Eigenschaften ist fehlgeschlagen"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Vollständig"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Konfliktbehaftet"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Extern"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Nicht anwendbar"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Unverändert"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Fehlende"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Zerstört"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Verändert"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Zusammengeführt"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Konfliktbehaftet"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignoriert"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Unvollständig"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Lokale Kopie"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Kopieren nach"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Lokal löschen"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Löschnachricht"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Zertifikat:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Datei auswählen"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Merken"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Zertifikat"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Pfad"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Alle auswählen/abwählen"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Importiermeldung"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Nachricht"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Aktion"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Datei"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Status"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Lognachricht"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Log fehlgeschlagen"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Bentuzername:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Passwort:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Anmelden"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Status"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Lognachricht"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Lokal verschieben"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Verschieben nach"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "MIME-Typ"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Benachrichtigung"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Name"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Das Setzen der Eigenschaften ist fehlgeschlagen"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Eigenschaften fehlgeschlagen"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Wert"
@@ -894,8 +1274,8 @@ msgstr "Wert"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "Selbst"
@@ -905,8 +1285,8 @@ msgstr "Selbst"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "Alle Dateien ab dieser Ebene"
@@ -916,152 +1296,87 @@ msgstr "Alle Dateien ab dieser Ebene"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "Rekursiv"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Das Setzen der Eigenschaften ist fehlgeschlagen"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Eigenschaften fehlgeschlagen"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_Von:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Wählen Sie einen Ordner"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Nach:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Verzeichnis:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Umplatzieren fehlgeschlagen"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Umplatzieren vollendet"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Platziere um ..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_Von:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Nach:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status fehlgeschlagen"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Unveränderte Dateien zeigen"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Unversionierte Dateien zeigen"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Ignorierte Dateien zeigen"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Externes verbergen"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Ablage überprüfen"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Status fehlgeschlagen"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Ablage:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Übertragen"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Zertifikat ist noch nicht gültig."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Zertifikat ist ausgelaufen."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "Zertifikat passt nicht zum Namen des entfernten Hosts."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "Zertifikatsgeber ist unbekannt."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Anderer Fehler."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Vertrauen"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "Aktion »Beschuldigen« ausführen"
+#~ msgid "Execute remove action"
+#~ msgstr "Aktion »Verschieben« ausführen"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "Aktion »Rückgängig« ausführen"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Optionen fürs Beschuldigen:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "Optionen für Aufgelöst:"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Optionen fürs Rückängigmachen:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Rückgängig"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Aufräumen vollständig"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Aufräumen vollständig"
diff --git a/po/en_GB.po b/po/en_GB.po
index 29b05fe..5638605 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,14 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
+# en_GB translation for thunar-vcs-plugin
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Jeff Bailes <thepizzaking at gamil.com>, 2009.
#
msgid ""
msgstr ""
"Project-Id-Version: thunart-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2008-05-10 13:15+1000\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
+"PO-Revision-Date: 2009-08-30 19:33+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking at gmail.com>\n"
"Language-Team: English/GB\n"
"MIME-Version: 1.0\n"
@@ -17,311 +17,487 @@ msgstr ""
"X-Poedit-Language: English\n"
"X-Poedit-Country: UNITED KINGDOM\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Add"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Add"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Blame"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Checkout"
+msgid "Menu|Branch"
+msgstr "Branch"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
-msgid "Changelist"
-msgstr "Changed"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Branch"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Cleanup"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Cleanup"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copy"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Commit"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Commit"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Switch"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Cleanup"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Info"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Infinity"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Move"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Merged"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Move"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Move"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Blame"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Reset"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Revert"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr "Reset"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Action %s is unimplemented"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Changelist"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Changelist"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Cleanup"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Cleanup"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Copy"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copy"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Delete"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Delete"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Export"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Export"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Import"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Import"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Lock"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Lock"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Move"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Move"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Edit Properties"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Edit Properties"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
-msgstr "Delete"
+msgstr "Relocate"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
-msgstr "Replaced"
+msgstr "Relocate"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Resolved"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resolved"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Resolve"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolve"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Revert"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Revert"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Switch"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Switch"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Unlock"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Unlock"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Update"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Update"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Action %s is unimplemented"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Unknown"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revision:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repository:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Modified revision:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Modified date:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Author:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
-msgstr "Changed"
+msgstr "Changelist:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
-msgstr ""
+msgstr "Depth:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
-msgstr ""
+msgstr "Exclude"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
-msgstr ""
+msgstr "Empty"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
-msgstr "File"
+msgstr "Files"
#. Translators: svn recursion depth infotmation
#. * Immediates depth means this file/direcotry and all of it's files and subdirectories are checked out
@@ -332,578 +508,749 @@ msgstr "File"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
-msgstr ""
+msgstr "Immediates"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
-msgstr ""
+msgstr "Infinity"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Print version information"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Execute add action"
-#: tvp-svn-helper/main.c:118
-#, fuzzy
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
+msgstr "Execute blame action"
+
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr "Execute branch action"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Execute cleanup action"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Execute log action"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Execute log action"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
msgstr "Execute move action"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr "Execute reset action"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Execute status action"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Execute status action"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Add Related Options:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Blame Related Options:"
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr "Branch Related Options:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Copy Related Options:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Log Related Options:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Move Related Options:"
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr "Reset Related Options:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Status Related Options:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Status Related Options:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Line"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revision"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Author"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Date"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Path"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Show Ignored Files"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Show Ignored Files"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Show Ignored Files"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Cleanup finished"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Cleaning up ..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Failed"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr "untracked"
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Select/Unselect all"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Author"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Commit"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Message"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Changed"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "File"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Cleanup finished"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Move To"
+
+#: ../tvp-git-helper/tgh-move.c:151
#, fuzzy
+msgid "Move ..."
+msgstr "Move"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Action"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Relocate finished"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Reset"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Name"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repository:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Select a folder"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Directory:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Transfer"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
-msgstr "Execute checkout action"
+msgstr "Execute changelist action"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Execute checkout action"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Execute cleanup action"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Execute commit action"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Execute copy action"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Execute delete action"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Execute export action"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Execute import action"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Execute lock action"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Execute log action"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Execute move action"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Execute properties action"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Execute resolved action"
-#: tvp-svn-helper/main.c:202
-#, fuzzy
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
-msgstr "Execute delete action"
+msgstr "Execute relocate action"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Execute revert action"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Execute status action"
-
-#: tvp-svn-helper/main.c:220
-#, fuzzy
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
-msgstr "Execute commit action"
+msgstr "Execute switch action"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Execute unlock action"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Execute update action"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Add Related Options:"
-
-#: tvp-svn-helper/main.c:250
-#, fuzzy
-msgid "Blame Related Options:"
-msgstr "Delete Related Options:"
-
-#: tvp-svn-helper/main.c:254
-#, fuzzy
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
-msgstr "Checkout Related Options:"
+msgstr "Changelist Related Options:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Checkout Related Options:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Cleanup Related Options:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Commit Related Options:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Copy Related Options:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Delete Related Options:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Export Related Options:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Import Related Options:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Lock Related Options:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Log Related Options:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Move Related Options:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Properties Related Options:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Properties"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Resolved Related Options:"
-#: tvp-svn-helper/main.c:306
-#, fuzzy
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
-msgstr "Delete Related Options:"
+msgstr "Relocate Related Options:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Revert Related Options:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Status Related Options:"
-
-#: tvp-svn-helper/main.c:318
-#, fuzzy
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
-msgstr "Commit Related Options:"
+msgstr "Switch Related Options:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Unlock Related Options:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Update Related Options:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Not enough arguments provided"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Failed"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-#, fuzzy
-msgid "Line"
-msgstr "Login"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revision"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Author"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Date"
-
-#: tvp-svn-helper/tsh-blame.c:75
-#, fuzzy
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
-msgstr "Revert failed"
+msgstr "Blame failed"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Cleanup failed"
-#: tvp-svn-helper/tsh-cleanup.c:81
-#, fuzzy
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Cleanup finished"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Cleaning up ..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "At revision: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Nothing to do"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Completed"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Commit Message"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
-msgstr ""
+msgstr "Store password in plaintext?"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Added"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Copied"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Deleted"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Restored"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Reverted"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Revert failed"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Skipped"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Updated"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "External"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Modified"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Replaced"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Transmitting"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Locked"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Unlocked"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Lock failed"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Unlock failed"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
-msgstr ""
+msgstr "Exists"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
-msgstr ""
+msgstr "Changelist set"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
-msgstr ""
+msgstr "Changelist cleared"
-#: tvp-svn-helper/tsh-common.c:522
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
-msgstr "Changed"
+msgstr "Changelist moved"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
-msgstr ""
+msgstr "Merge begin"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
-msgstr ""
+msgstr "Foreign merge begin"
-#: tvp-svn-helper/tsh-common.c:525
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
-msgstr "Replaced"
+msgstr "Replace"
-#: tvp-svn-helper/tsh-common.c:527
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
-msgstr "Properties failed"
+msgstr "Property added"
-#: tvp-svn-helper/tsh-common.c:528
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
-msgstr "Properties failed"
+msgstr "Property modified"
-#: tvp-svn-helper/tsh-common.c:529
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
-msgstr "Properties failed"
+msgstr "Property deleted"
-#: tvp-svn-helper/tsh-common.c:530
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
-msgstr "Properties"
+msgstr "Property nonexisting"
-#: tvp-svn-helper/tsh-common.c:531
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
-msgstr "Set property failed"
+msgstr "Revision property set"
-#: tvp-svn-helper/tsh-common.c:532
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
-msgstr "Set property failed"
+msgstr "Revision property deleted"
-#: tvp-svn-helper/tsh-common.c:533
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
-msgstr "Completed"
+msgstr "Merge completed"
-#: tvp-svn-helper/tsh-common.c:534
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
-msgstr "Conflicted"
+msgstr "Tree conflict"
-#: tvp-svn-helper/tsh-common.c:535
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
-msgstr "External"
+msgstr "External failed"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Inapplicable"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Unchanged"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Missing"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Obstructed"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Changed"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Merged"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Conflicted"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignored"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incomplete"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Local copy"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Copy To"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Local delete"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Delete Message"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificate:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Select a file"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Remember"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificate"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Path"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Import Message"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Message"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Action"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "File"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "State"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Log Message"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Log failed"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Username:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Password:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Login"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "State"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Log Message"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Local move"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Move To"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime type"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notification"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Name"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Set property failed"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Properties failed"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Value"
@@ -913,10 +1260,10 @@ msgstr "Value"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
-msgstr ""
+msgstr "Self"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are updated
@@ -924,11 +1271,10 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
-#, fuzzy
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
-msgstr "Revert failed"
+msgstr "Immediate files"
#. Translators: svn recursion selection
#. * Recursive means the update is full recursive
@@ -936,159 +1282,92 @@ msgstr "Revert failed"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
-#, fuzzy
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
-msgstr "Show Recursive"
+msgstr "Recursive"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Set property failed"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
+msgstr "Relocate failed"
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Properties failed"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
+msgstr "Relocate finished"
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr ""
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
+msgstr "Relocating ..."
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Select a folder"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_From:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Directory:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
-#, fuzzy
-msgid "Relocate failed"
-msgstr "Revert failed"
-
-#: tvp-svn-helper/tsh-relocate.c:86
-#, fuzzy
-msgid "Relocate finished"
-msgstr "Cleanup finished"
+msgstr "_To:"
-#: tvp-svn-helper/tsh-relocate.c:128
-#, fuzzy
-msgid "Relocating ..."
-msgstr "Cleaning up ..."
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status failed"
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Show Unmodified Files"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Show Unversioned Files"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Show Ignored Files"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Hide Externals"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Check Repository"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Status failed"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repository:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Transfer"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Certificate is not yet valid."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Certificate has expired."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "Certificate does not match the remote hostname."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "Certificate authority is unknown."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Other failure."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Trust"
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Execute move action"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Execute revert action"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Delete Related Options:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Revert Related Options:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
#, fuzzy
-msgid "Reset"
-msgstr "Revert"
+#~ msgid "Execute remove action"
+#~ msgstr "Execute move action"
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "Cleanup finished"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Resolved Related Options:"
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Add finished"
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "Adding ..."
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s on %2$s"
diff --git a/po/es.po b/po/es.po
index 9a0cde3..39bf44a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin 0.0.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2008-12-16 21:49+0100\n"
-"Last-Translator: Abel Martín <abel.martin.ruiz at gmail.com>\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
+"PO-Revision-Date: 2009-10-27 18:05-0300\n"
+"Last-Translator: elega <elega at elega.com.ar>\n"
"Language-Team: Spanish <xfce-i18n at xfce.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,309 +17,490 @@ msgstr ""
"X-Poedit-Country: SPAIN\n"
"X-Poedit-SourceCharset: utf-8\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Añadir"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Añadir"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Revisión detallada"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Revisión detallada"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Revisión detallada"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Obtener"
+msgid "Menu|Branch"
+msgstr "Rama"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
-msgid "Changelist"
-msgstr "Cambiado"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Rama"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Obtener"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Obtener"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Eliminar bloqueos"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Eliminar bloqueos"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copiar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Enviar cambios"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Enviar cambios"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diferencias"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diferencias"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Intercambiar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Eliminar bloqueos"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Información"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Infinito"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Mostrar registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Mostrar registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Fusionado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Revisión detallada"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Restablecer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Revertir"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr "Restablecer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Mostrar registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Estado"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Mostrar registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "La acción %s no está implementada"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Menú|Lista de cambios"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Changelist"
+msgstr "Lista de cambios"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Eliminar bloqueos"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Eliminar bloqueos"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Borrar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Borrar"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diferencias"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diferencias"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Información"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Información"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Bloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Bloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Mostrar registro"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Mostrar registro"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Editar propiedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Editar propiedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Reubicar"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Reubicar"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Resuelto"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resuelto"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Revertir"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Revertir"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Estado"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Estado"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Intercambiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Intercambiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Desbloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Desbloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Actualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Actualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "La acción %s no está implementada"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Desconocido"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revisión:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repositorio:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Revisión modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Fecha modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
#, fuzzy
msgid "Changelist:"
-msgstr "Cambiado"
+msgstr "Lista de cambios:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
-msgstr ""
+msgstr "Profundidad:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
-msgstr ""
+msgstr "Excluir:"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
-msgstr ""
+msgstr "Vacío"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
-msgstr "Archivo"
+msgstr "Archivos"
#. Translators: svn recursion depth infotmation
#. * Immediates depth means this file/direcotry and all of it's files and subdirectories are checked out
@@ -330,569 +511,759 @@ msgstr "Archivo"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
-msgstr ""
+msgstr "Inmediatos"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
-msgstr ""
+msgstr "Infinito"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Imprimir información de versión"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Ejecutar acción añadir"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Ejecutar acción diferencias detalladas"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Ejecutar la acción rama"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Ejecutar acción eliminar bloqueos"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Ejecutar acción mostrar registro"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Ejecutar acción mostrar registro"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Ejecutar acción mover"
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr "Ejecutar la acción restablecer"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Ejecutar acción estado"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Ejecutar acción estado"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Opciones relacionadas con añadir:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Opciones relacionadas con revisión detallada:"
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr "Restablecer las opciones relacionadas con:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Opciones relacionadas con copiar:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Opciones relacionadas con mostrar registro:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Opciones relacionadas con mover:"
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr "Restablecer las opciones relacionadas con:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Opciones relacionadas con estado:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Opciones relacionadas con estado:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Línea"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revisión"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Fecha"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Ruta"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Mostrar archivos ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Mostrar archivos ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Mostrar archivos ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Eliminación de bloqueos finalizada"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Eliminando bloqueos..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Fallo"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr "sin seguimiento"
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Seleccionar/Deseleccionar todos"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Enviar cambios"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Mensaje"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Cambiado"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Archivo"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Eliminación de bloqueos finalizada"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Mover a"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Mover"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Acción"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Finalizó la reubicación"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Restablecer"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nombre"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repositorio:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Seleccione carpeta"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Directorio:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Transferencia"
+
+#: ../tvp-svn-helper/main.c:124
#, fuzzy
msgid "Execute changelist action"
msgstr "Ejecutar acción obtener"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Ejecutar acción obtener"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Ejecutar acción eliminar bloqueos"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Ejecutar acción enviar cambios"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Ejecutar acción copiar"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Ejecutar acción borrar"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Ejecutar acción exportar"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Ejecutar acción importar"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Ejecutar acción bloquear"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Ejecutar acción mostrar registro"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Ejecutar acción mover"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Ejecutar acción propiedades"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Ejecutar acción resuelto"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Ejecutar acción reubicar"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Ejecutar acción revertir"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Ejecutar acción estado"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Ejecutar acción intercambiar"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Ejecutar acción desbloquear"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Ejecutar acción actualizar"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Opciones relacionadas con añadir:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Opciones relacionadas con revisión detallada:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
#, fuzzy
msgid "Changelist Related Options:"
msgstr "Opciones relacionadas con obtener:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Opciones relacionadas con obtener:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Opciones relacionadas con eliminar bloqueos:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Opciones relacionadas con enviar cambios:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Opciones relacionadas con copiar:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Opciones relacionadas con borrar:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Opciones relacionadas con exportar:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Opciones relacionadas con importar:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Opciones relacionadas con bloquear:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Opciones relacionadas con mostrar registro:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Opciones relacionadas con mover:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Opciones relacionadas con propiedades:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Propiedades"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Opciones relacionadas con resuelto:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Opciones relacionadas con reubicar:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Opciones relacionadas con revertir:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Opciones relacionadas con estado:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Opciones relacionadas con intercambiar:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Opciones relacionadas con desbloquear:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Opciones relacionadas con actualizar:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "No se proporcionaron argumentos suficientes"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Fallo"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Línea"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revisión"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Fecha"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Fallo al hacer la revisión detallada"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Fallo al eliminar bloqueos"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Eliminación de bloqueos finalizada"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Eliminando bloqueos..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "En la revisión: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Nada que hacer"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Completado"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Mensaje de envío de cambios"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
-msgstr ""
+msgstr "¿Almacenar la contraseña en un texto plano?"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Añadido"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Copiado"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Borrado"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Restaurado"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Revertido"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Fallo al revertir"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Omitido"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Actualizado"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Externo"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Sustituido"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Transmitiendo"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Bloqueado"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Desbloqueado"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Fallo al bloquear"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Fallo al desbloquear"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
-msgstr ""
+msgstr "Existe"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
+#, fuzzy
msgid "Changelist set"
-msgstr ""
+msgstr "Establecer lista de cambios"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
+#, fuzzy
msgid "Changelist cleared"
-msgstr ""
+msgstr "Lista de cambios liberada"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
#, fuzzy
msgid "Changelist moved"
-msgstr "Cambiado"
+msgstr "Lista de cambios movida"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
-msgstr ""
+msgstr "Comenzar a fusionar"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
+#, fuzzy
msgid "Foreign merge begin"
-msgstr ""
+msgstr "Comenzar "
-#: tvp-svn-helper/tsh-common.c:525
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
-msgstr "Sustituido"
+msgstr "Reemplazar"
-#: tvp-svn-helper/tsh-common.c:527
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
-msgstr "Fallo en las propiedades"
+msgstr "Propiedad añadida"
-#: tvp-svn-helper/tsh-common.c:528
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
-msgstr "Fallo en las propiedades"
+msgstr "Propiedad modificada"
-#: tvp-svn-helper/tsh-common.c:529
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
-msgstr "Fallo en las propiedades"
+msgstr "Propiedad eliminada"
-#: tvp-svn-helper/tsh-common.c:530
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
-msgstr "Propiedades"
+msgstr "Propiedad inexistente"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
-msgstr "Fallo al establecer propiedad"
+msgstr "Propiedad de revisión establecida"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
-msgstr "Fallo al establecer propiedad"
+msgstr "Propiedad de revisión eliminada"
-#: tvp-svn-helper/tsh-common.c:533
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
-msgstr "Completado"
+msgstr "Fusión finalizada"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
-msgstr "En conflicto"
+msgstr "Árbol de conflicto"
-#: tvp-svn-helper/tsh-common.c:535
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
-msgstr "Externo"
+msgstr "Fallo externo"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "No aplicable"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Sin cambios"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Ausente"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Obstruido"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Cambiado"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Fusionado"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "En conflicto"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignorado"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incompleto"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Copia local"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Copiar a"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Borrado local"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Mensaje de borrado"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificado:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Seleccione un archivo"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Recordar"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificado"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Ruta"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Seleccionar/Deseleccionar todos"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Mensaje de importación"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Mensaje"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Acción"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Archivo"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Estado"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Mensaje de muestra de registro"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Registrar fallos"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Usuario:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Contraseña:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Inicio de sesión"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Estado"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Mensaje de muestra de registro"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Mover en local"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Mover a"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipo MIME"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificación"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nombre"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Fallo al establecer propiedad"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Fallo en las propiedades"
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Valor"
@@ -902,10 +1273,10 @@ msgstr "Valor"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
-msgstr ""
+msgstr "Auto"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are updated
@@ -913,11 +1284,10 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
-#, fuzzy
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
-msgstr "Fallo al reubicar"
+msgstr "Archivos inmediatos"
#. Translators: svn recursion selection
#. * Recursive means the update is full recursive
@@ -925,156 +1295,84 @@ msgstr "Fallo al reubicar"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
-#, fuzzy
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
-msgstr "Mostrar recursivamente"
-
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Fallo al establecer propiedad"
+msgstr "Recursivo"
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Fallo en las propiedades"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_De:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Seleccione carpeta"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_A:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Directorio:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Fallo al reubicar"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Finalizó la reubicación"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Reubicando..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_De:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_A:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Fallo al obtener el estado"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Mostrar archivos sin modificar"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Mostrar archivos sin versión"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Mostrar archivos ignorados"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Ocultar externos"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Comprobar repositorio"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Fallo al obtener el estado"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repositorio:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Transferencia"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "El certificado todavía no es válido."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "El certificado ha expirado."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "El certificado no concuerda con el nombre del equipo remoto"
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "La autoridad de certificación es desconocida."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Otros fallos."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Confianza"
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Ejecutar acción diferencias detalladas"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Ejecutar acción revertir"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Opciones relacionadas con revisión detallada:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Añadir finalizado"
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Opciones relacionadas con revertir:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Revertir"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Eliminación de bloqueos finalizada"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "Añadiendo ..."
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s de %2$s"
diff --git a/po/fr.po b/po/fr.po
index 26be94b..cff6ca1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: xfce-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2007-10-24 13:04+0100\n"
"Last-Translator: Mike Massonnet <mmassonnet at gmail.com>\n"
"Language-Team: French\n"
@@ -17,329 +17,511 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Ajouter"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Différences détaillées"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
#, fuzzy
msgid "Menu|Blame"
msgstr "Différences détaillées"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Différences détaillées"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Extraction"
+msgid "Menu|Branch"
+msgstr "Différences détaillées"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
#, fuzzy
msgid "Menu|Checkout"
msgstr "Extraction"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Extraction"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
#, fuzzy
-msgid "Menu|Cleanup"
+msgid "Menu|Clean"
msgstr "Nettoyer les verrous"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Nettoyer les verrous"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Complété"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
#, fuzzy
msgid "Menu|Commit"
msgstr "Envoyer"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Envoyer"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+#, fuzzy
+msgid "Menu|Diff"
+msgstr "Différences"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Différences"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Modifier l'adresse du dépôt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Nettoyer les verrous"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Information"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Journal"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Effacer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Envoyer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Différences détaillées"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "État"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Fixer comme résolu"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Restaurer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Restaurer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Restaurer"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Fixer comme résolu"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Fixer comme résolu"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Modifier l'adresse du dépôt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "État"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "État"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+#, fuzzy
+msgid "Menu|Status"
+msgstr "État"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "État"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Différences détaillées"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr ""
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Extraction"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+#, fuzzy
+msgid "Menu|Cleanup"
+msgstr "Nettoyer les verrous"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Nettoyer les verrous"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
#, fuzzy
msgid "Menu|Copy"
msgstr "Complété"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
#, fuzzy
msgid "Copy"
msgstr "Complété"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
#, fuzzy
msgid "Menu|Delete"
msgstr "Effacer"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Effacer"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-#, fuzzy
-msgid "Menu|Diff"
-msgstr "Différences"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Différences"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
#, fuzzy
msgid "Menu|Export"
msgstr "Exporter"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exporter"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
#, fuzzy
msgid "Menu|Import"
msgstr "SVN _Importer"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
#, fuzzy
msgid "Import"
msgstr "SVN _Importer"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
#, fuzzy
msgid "Menu|Info"
msgstr "Information"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Information"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
#, fuzzy
msgid "Menu|Lock"
msgstr "Bloquer"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Bloquer"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Journal"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
#, fuzzy
msgid "Menu|Edit Properties"
msgstr "Éditer les propriétés"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Éditer les propriétés"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
#, fuzzy
msgid "Menu|Relocate"
msgstr "Effacer"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
#, fuzzy
msgid "Menu|Resolved"
msgstr "Fixer comme résolu"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
#, fuzzy
msgid "Resolved"
msgstr "Fixer comme résolu"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
#, fuzzy
msgid "Menu|Resolve"
msgstr "Fixer comme résolu"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Fixer comme résolu"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
#, fuzzy
msgid "Menu|Revert"
msgstr "Restaurer"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Restaurer"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-#, fuzzy
-msgid "Menu|Status"
-msgstr "État"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "État"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
#, fuzzy
msgid "Menu|Switch"
msgstr "Modifier l'adresse du dépôt"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Modifier l'adresse du dépôt"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
#, fuzzy
msgid "Menu|Unlock"
msgstr "Débloquer"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Débloquer"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
#, fuzzy
msgid "Menu|Update"
msgstr "Mettre à jour"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Mettre à jour"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
#, fuzzy
msgid "Revision:"
msgstr "À la révision : %li"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
#, fuzzy
msgid "Repository:"
msgstr "Fixer comme résolu"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr ""
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr ""
@@ -352,615 +534,809 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Afficher l'information sur la version"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
#, fuzzy
msgid "Execute add action"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
#, fuzzy
msgid "Execute blame action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Exécuter une extraction"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Exécuter une extraction"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+#, fuzzy
+msgid "Execute log action"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+#, fuzzy
+msgid "Execute move action"
+msgstr "Exécuter une extraction"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Exécuter une extraction"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+#, fuzzy
+msgid "Execute status action"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+#, fuzzy
+msgid "Blame Related Options:"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Exécuter une mise à jour"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+#, fuzzy
+msgid "Line"
+msgstr "Se connecter"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+#, fuzzy
+msgid "Revision"
+msgstr "À la révision : %li"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+#, fuzzy
+msgid "Date"
+msgstr "État"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Chemin"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+msgid "Excldue ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+msgid "Include ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+msgid "Only ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Nettoyer les verrous"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Nettoyer les verrous"
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+msgid "AuthorDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Envoyer"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+#, fuzzy
+msgid "Message"
+msgstr "Envoyer"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Extraction"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Nettoyer les verrous"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:151
+msgid "Move ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Action"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Nettoyer les verrous"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Restaurer"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+#, fuzzy
+msgid "Name"
+msgstr "Différences détaillées"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr ""
+
+#: ../tvp-svn-helper/main.c:124
#, fuzzy
msgid "Execute changelist action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
#, fuzzy
msgid "Execute cleanup action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
#, fuzzy
msgid "Execute commit action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
#, fuzzy
msgid "Execute copy action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
#, fuzzy
msgid "Execute delete action"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
#, fuzzy
msgid "Execute export action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
#, fuzzy
msgid "Execute import action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
#, fuzzy
msgid "Execute lock action"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:178
-#, fuzzy
-msgid "Execute log action"
-msgstr "Exécuter une mise à jour"
-
-#: tvp-svn-helper/main.c:184
-#, fuzzy
-msgid "Execute move action"
-msgstr "Exécuter une extraction"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
#, fuzzy
msgid "Execute properties action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
#, fuzzy
msgid "Execute resolved action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
#, fuzzy
msgid "Execute relocate action"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
#, fuzzy
msgid "Execute revert action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-#, fuzzy
-msgid "Execute status action"
-msgstr "Exécuter une mise à jour"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
#, fuzzy
msgid "Execute switch action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
#, fuzzy
msgid "Execute unlock action"
msgstr "Exécuter une extraction"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:250
-#, fuzzy
-msgid "Blame Related Options:"
-msgstr "Exécuter une mise à jour"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
#, fuzzy
msgid "Changelist Related Options:"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
#, fuzzy
msgid "Checkout Related Options:"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
#, fuzzy
msgid "Properties Related Options:"
msgstr "Éditer les propriétés"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
#, fuzzy
msgid "Properties"
msgstr "Éditer les propriétés"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
#, fuzzy
msgid "Relocate Related Options:"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
#, fuzzy
msgid "Switch Related Options:"
msgstr "Exécuter une mise à jour"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr ""
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-#, fuzzy
-msgid "Line"
-msgstr "Se connecter"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-#, fuzzy
-msgid "Revision"
-msgstr "À la révision : %li"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-#, fuzzy
-msgid "Date"
-msgstr "État"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
#, fuzzy
msgid "Blame failed"
msgstr "Restaurer"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
#, fuzzy
msgid "Cleanup failed"
msgstr "Nettoyer les verrous"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
#, fuzzy
msgid "Cleanup finished"
msgstr "Nettoyer les verrous"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
#, fuzzy
msgid "Cleaning up ..."
msgstr "Nettoyer les verrous"
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, fuzzy, c-format
msgid "At revision: %ld"
msgstr "À la révision : %li"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Complété"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
#, fuzzy
msgid "Commit Message"
msgstr "Envoyer"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Ajouté"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
#, fuzzy
msgid "Copied"
msgstr "Complété"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Effacé"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
#, fuzzy
msgid "Restored"
msgstr "Fixer comme résolu"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
#, fuzzy
msgid "Reverted"
msgstr "Restaurer"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
#, fuzzy
msgid "Revert failed"
msgstr "Restaurer"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Mise à jour"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Externe"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
#, fuzzy
msgid "Locked"
msgstr "Bloquer"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
#, fuzzy
msgid "Unlocked"
msgstr "Débloquer"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
#, fuzzy
msgid "Unlock failed"
msgstr "Débloquer"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Éditer les propriétés"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Éditer les propriétés"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Éditer les propriétés"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Éditer les propriétés"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Restaurer"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Restaurer"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Complété"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Complété"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Externe"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
#, fuzzy
msgid "Conflicted"
msgstr "Complété"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
#, fuzzy
msgid "Incomplete"
msgstr "Complété"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
#, fuzzy
msgid "Delete Message"
msgstr "Envoyer"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Se souvenir"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
#, fuzzy
msgid "Certificate"
msgstr "Notification"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Chemin"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
#, fuzzy
msgid "Import Message"
msgstr "Envoyer"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-#, fuzzy
-msgid "Message"
-msgstr "Envoyer"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Action"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-#, fuzzy
-msgid "State"
-msgstr "État"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
#, fuzzy
msgid "Log failed"
msgstr "Débloquer"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Utilisateur :"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Mot de passe"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Se connecter"
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+#, fuzzy
+msgid "State"
+msgstr "État"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Type mime"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notification"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
#, fuzzy
-msgid "Name"
-msgstr "Différences détaillées"
+msgid "Set property failed"
+msgstr "Restaurer"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+#, fuzzy
+msgid "Properties failed"
+msgstr "Éditer les propriétés"
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr ""
@@ -970,8 +1346,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -981,8 +1357,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
#, fuzzy
msgid "Immediate files"
msgstr "Restaurer"
@@ -993,163 +1369,96 @@ msgstr "Restaurer"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
msgstr "Fixer comme résolu"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
+#: ../tvp-svn-helper/tsh-relocate.c:71
#, fuzzy
-msgid "Set property failed"
+msgid "Relocate failed"
msgstr "Restaurer"
-#: tvp-svn-helper/tsh-properties.c:104
+#: ../tvp-svn-helper/tsh-relocate.c:86
#, fuzzy
-msgid "Properties failed"
-msgstr "Éditer les propriétés"
+msgid "Relocate finished"
+msgstr "Nettoyer les verrous"
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr ""
+#: ../tvp-svn-helper/tsh-relocate.c:128
+#, fuzzy
+msgid "Relocating ..."
+msgstr "Nettoyer les verrous"
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-status.c:86
#, fuzzy
-msgid "Relocate failed"
-msgstr "Restaurer"
-
-#: tvp-svn-helper/tsh-relocate.c:86
-#, fuzzy
-msgid "Relocate finished"
-msgstr "Nettoyer les verrous"
-
-#: tvp-svn-helper/tsh-relocate.c:128
-#, fuzzy
-msgid "Relocating ..."
-msgstr "Nettoyer les verrous"
+msgid "Status failed"
+msgstr "État"
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
#, fuzzy
msgid "Hide Externals"
msgstr "Externe"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-#, fuzzy
-msgid "Status failed"
-msgstr "État"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr ""
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Exécuter une extraction"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Exécuter une extraction"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Exécuter une mise à jour"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Exécuter une mise à jour"
+#~ msgid "Execute remove action"
+#~ msgstr "Exécuter une extraction"
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
#, fuzzy
-msgid "Reset"
-msgstr "Restaurer"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Exécuter une mise à jour"
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "Nettoyer les verrous"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Nettoyer les verrous"
#, fuzzy
#~ msgid "Modify Property Recursive"
diff --git a/po/gl.po b/po/gl.po
index 1100197..8e76c91 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2009-04-14 22:02+0100\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
+"PO-Revision-Date: 2009-11-04 21:34+0100\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
"MIME-Version: 1.0\n"
@@ -20,313 +20,496 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Engadir"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Engadir"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Disposición do menú"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
#, fuzzy
msgid "Menu|Blame"
-msgstr "Menú Pinceis"
+msgstr "Disposición do menú"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Menú Pinceis"
+msgid "Menu|Branch"
+msgstr "Ramificación"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
-msgid "Changelist"
-msgstr "Lista de cambios"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Ramificación"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
#, fuzzy
msgid "Menu|Checkout"
-msgstr "Menú Pinceis"
+msgstr "Directorio de checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
+#, fuzzy
msgid "Checkout"
-msgstr ""
+msgstr "Directorio de checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
#, fuzzy
-msgid "Menu|Cleanup"
-msgstr "Menú Pinceis"
+msgid "Menu|Clean"
+msgstr "Disposición do menú"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
#, fuzzy
-msgid "Cleanup"
+msgid "Clean"
msgstr "A limpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copiar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
#, fuzzy
msgid "Menu|Commit"
-msgstr "Enviar cambios"
+msgstr "Actualizar os cambios"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
#, fuzzy
msgid "Commit"
-msgstr "E_fectuar"
+msgstr "Efectuar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diferencias"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+#, fuzzy
+msgid "Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Cambiar de usuario"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Disposición do menú"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Información"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "infinito"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Rexistro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Rexistro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Combinado: %s"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Disposición do menú"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "_Resolver os conflitos..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Reiniciar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Restaurar os cambios?"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "_Resolver os conflitos..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "_Resolver os conflitos..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Rexistro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Estado"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Estado"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Rexistro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "A acción %s non está implementada"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Disposición do menú"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Lista de cambios"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+#, fuzzy
+msgid "Menu|Cleanup"
+msgstr "Disposición do menú"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+#, fuzzy
+msgid "Cleanup"
+msgstr "A limpar"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Eliminar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Eliminar"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diferencias"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-#, fuzzy
-msgid "Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Información"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Información"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Bloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Bloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Rexistro"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Rexistro"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Editar as propiedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Editar as propiedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
#, fuzzy
msgid "Menu|Relocate"
-msgstr "Menú Pinceis"
+msgstr "Disposición do menú"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
#, fuzzy
msgid "Menu|Resolved"
-msgstr "Menú Pinceis"
+msgstr "Resolveuse o seudónimo «%s» -> %s\n"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resolto"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
#, fuzzy
msgid "Menu|Resolve"
-msgstr "_Resolver conflitos..."
+msgstr "_Resolver os conflitos..."
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
#, fuzzy
msgid "Resolve"
-msgstr "_Resolver conflitos..."
+msgstr "_Resolver os conflitos..."
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
#, fuzzy
msgid "Menu|Revert"
-msgstr "Reverter imaxe"
+msgstr "Restaurar os cambios?"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
#, fuzzy
msgid "Revert"
msgstr "Reverter"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Estado"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Estado"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
#, fuzzy
msgid "Menu|Switch"
msgstr "Cambiar de usuario"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
#, fuzzy
msgid "Switch"
-msgstr "Intercambio"
+msgstr "Cambiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Desbloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Desbloquear"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Actualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Actualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "A acción %s non está implementada"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Descoñecido"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revisión:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repositorio:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Revisión modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Data de modificación:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Lista de cambios:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Profundidade:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "Excluír"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
#, fuzzy
msgid "Empty"
msgstr "Baleiro"
@@ -334,7 +517,7 @@ msgstr "Baleiro"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Ficheiros"
@@ -347,709 +530,831 @@ msgstr "Ficheiros"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
#, fuzzy
msgid "Infinity"
msgstr "infinito"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Mostrar a información da versión"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Executar a acción de engadir"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
#, fuzzy
msgid "Execute blame action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+#, fuzzy
+msgid "Execute log action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+#, fuzzy
+msgid "Execute move action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+#, fuzzy
+msgid "Execute status action"
+msgstr "Desfacer a última acción"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+#, fuzzy
+msgid "Add Related Options:"
+msgstr "Engadir táboa _relacionada"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+#, fuzzy
+msgid "Blame Related Options:"
+msgstr "<b>Opcións de exportación HTML:</b>"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "<b>Opcións de exportación HTML:</b>"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Opcións de copia de CD/DVD"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+#, fuzzy
+msgid "Log Related Options:"
+msgstr "<b>Opcións de exportación HTML:</b>"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+#, fuzzy
+msgid "Move Related Options:"
+msgstr "<b>Opcións de exportación HTML:</b>"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Restablecer opcións da ferramenta"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "<b>Opcións de exportación HTML:</b>"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+#, fuzzy
+msgid "Status Related Options:"
+msgstr "<b>Opcións de exportación HTML:</b>"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Liña"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revisión"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Data"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Ruta"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Amosar fic_heiros agochados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Amosar fic_heiros agochados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Amosar fic_heiros agochados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "A función terminou\n"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Mover arriba"
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Fallou"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+#, fuzzy
+msgid "Select/Unselect all"
+msgstr "Deseleccionar todas as pistas"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Efectuar"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Mensaxe"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Modificado"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Ficheiro"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "A función terminou\n"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Mover a"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Mover"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Acción"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "A función terminou\n"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Reiniciar"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nome"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repositorio:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Seleccione un cartafol"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Directorio:"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Transferir"
+
+#: ../tvp-svn-helper/main.c:124
#, fuzzy
msgid "Execute changelist action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
#, fuzzy
msgid "Execute checkout action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
#, fuzzy
msgid "Execute cleanup action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
#, fuzzy
msgid "Execute commit action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
#, fuzzy
msgid "Execute copy action"
-msgstr "Desface-la última acción"
+msgstr "Crear unha copia da acción seleccionada."
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Executar a acción de eliminar"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
#, fuzzy
msgid "Execute export action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
#, fuzzy
msgid "Execute import action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
#, fuzzy
msgid "Execute lock action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:178
-#, fuzzy
-msgid "Execute log action"
-msgstr "Desface-la última acción"
-
-#: tvp-svn-helper/main.c:184
-#, fuzzy
-msgid "Execute move action"
-msgstr "Desface-la última acción"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
#, fuzzy
msgid "Execute properties action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
#, fuzzy
msgid "Execute resolved action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
#, fuzzy
msgid "Execute relocate action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
#, fuzzy
msgid "Execute revert action"
-msgstr "Desface-la última acción"
-
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-#, fuzzy
-msgid "Execute status action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
#, fuzzy
msgid "Execute switch action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
#, fuzzy
msgid "Execute unlock action"
-msgstr "Desface-la última acción"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
#, fuzzy
msgid "Execute update action"
-msgstr "Desface-la última acción"
-
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-#, fuzzy
-msgid "Add Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "Desfacer a última acción"
-#: tvp-svn-helper/main.c:250
-#, fuzzy
-msgid "Blame Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
#, fuzzy
msgid "Changelist Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
#, fuzzy
msgid "Checkout Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
#, fuzzy
msgid "Cleanup Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
#, fuzzy
msgid "Commit Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
#, fuzzy
msgid "Copy Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "Opcións de copia de CD/DVD"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
#, fuzzy
msgid "Delete Related Options:"
msgstr "_Eliminar as opcións gardadas"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
#, fuzzy
msgid "Export Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
#, fuzzy
msgid "Import Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
#, fuzzy
msgid "Lock Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
-
-#: tvp-svn-helper/main.c:290
-#, fuzzy
-msgid "Log Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:294
-#, fuzzy
-msgid "Move Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
#, fuzzy
msgid "Properties Related Options:"
-msgstr "Opcións para modificar as propiedades dunha ventá"
+msgstr "Opcións para modificar as propiedades dunha xanela"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Propiedades"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
#, fuzzy
msgid "Resolved Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
#, fuzzy
msgid "Relocate Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
#, fuzzy
msgid "Revert Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
-
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-#, fuzzy
-msgid "Status Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
#, fuzzy
msgid "Switch Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
#, fuzzy
msgid "Unlock Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
#, fuzzy
msgid "Update Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
+msgstr "<b>Opcións de exportación HTML:</b>"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Non se proporcionaron argumentos suficientes"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Fallou"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Liña"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revisión"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Data"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
#, fuzzy
msgid "Blame failed"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "fallou execvp"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
#, fuzzy
msgid "Cleanup failed"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "fallou execvp"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
#, fuzzy
msgid "Cleanup finished"
-msgstr "Debuxo rematado"
+msgstr "A función terminou\n"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
#, fuzzy
msgid "Cleaning up ..."
-msgstr "Subir cursor"
+msgstr "Mover arriba"
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, fuzzy, c-format
msgid "At revision: %ld"
-msgstr "Vectorizar: %d. %ld nodos"
+msgstr "Na revisión %ld."
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
#, fuzzy
msgid "Nothing to do"
-msgstr "Non hai nada que desfacer."
+msgstr "Lista de cousas por facer"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Completado"
-#: tvp-svn-helper/tsh-commit.c:145
-#, fuzzy
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
-msgstr "Mensaxe de GIMP"
+msgstr "Mensaxe de remisión"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
+#, fuzzy
msgid "Store password a plaintext?"
-msgstr ""
+msgstr "Contrasinal de texto plano ou seguro"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Engadido"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Copiado"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Eliminado"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
+#, fuzzy
msgid "Reverted"
-msgstr ""
+msgstr "Revertido: %s"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
#, fuzzy
msgid "Revert failed"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "Fallou a reversión: %s"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
+#, fuzzy
msgid "Skipped"
-msgstr ""
+msgstr "Omitido"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Actualizado"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Externo"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Substituido"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Transmitindo"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Bloqueado"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Desbloqueado"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Fallo ó bloquear"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Fallo ó desbloquear"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Existe"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
#, fuzzy
msgid "Changelist set"
-msgstr "Establecer o atributo"
+msgstr "Establecer preferencias"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
#, fuzzy
msgid "Changelist cleared"
msgstr "O gatekeeper eliminou a chamada"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
#, fuzzy
msgid "Changelist moved"
msgstr "Movido permanentemente"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
#, fuzzy
msgid "Merge begin"
-msgstr "_Combinar paletas..."
+msgstr "TN_Inicio"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
#, fuzzy
msgid "Foreign merge begin"
-msgstr "Combinar capas _visibles..."
+msgstr "Produciuse un erro na orde BEGIN %s."
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Substituír"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "Engadido recentemente"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "Modificado o:"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "Elementos eliminados"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
-msgstr "Propiedades"
+msgstr "Propiedades do alcume"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
-msgstr "Establecer as propiedades do sinal"
+msgstr "Definir a propiedade do sinal"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
-msgstr "Establecer as propiedades do sinal"
+msgstr "Git: Eliminouse a ramificación \"%s\"."
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
-msgstr "Completado"
+msgstr "Terminou sen éxito\n"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
-msgstr "Con conflitos"
+msgstr "Opcións de conflitos"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
-msgstr "Externo"
+msgstr "fallou execvp"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Sen cambios"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
#, fuzzy
msgid "Missing"
-msgstr "Falta"
+msgstr "Perdido"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
#, fuzzy
msgid "Obstructed"
-msgstr "Obstruídos: %s"
+msgstr "Obstruído: %s"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
#, fuzzy
msgid "Changed"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
#, fuzzy
msgid "Merged"
msgstr "Combinado: %s"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
#, fuzzy
msgid "Conflicted"
-msgstr "Con conflitos"
+msgstr "Con conflictos"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignorado"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incompleto"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Copia local"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Copiar a"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
#, fuzzy
msgid "Local delete"
-msgstr "Eliminar guía"
+msgstr "/Local/_Borrar..."
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
#, fuzzy
msgid "Delete Message"
msgstr "E_liminar mensaxe"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificado:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Seleccione un ficheiro"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
#, fuzzy
msgid "Remember"
-msgstr "_Recordar para sempre"
+msgstr "Recordar"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificado"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Ruta"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-#, fuzzy
-msgid "Select/Unselect all"
-msgstr "Seleccionar todos os erros"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Mensaxe de importación"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Mensaxe"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Acción"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Ficheiro"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Estado"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Mensaxe de rexistro"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
#, fuzzy
msgid "Log failed"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
+msgstr "Produciuse un erro ao terminar a sesión."
-#: tvp-svn-helper/tsh-login-dialog.c:65
-#, fuzzy
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "Nome de _usuario:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Contrasinal:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
#, fuzzy
msgid "Login"
-msgstr "Inicio de sesión"
+msgstr "Iniciar sesión"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Estado"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Mensaxe de rexistro"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-move.c:94
#, fuzzy
msgid "Local move"
-msgstr "Mover guía"
-
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Mover a"
+msgstr "Mover abaixo"
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipo mime"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificación"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nome"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+#, fuzzy
+msgid "Set property failed"
+msgstr "Ocorreu un erro ó definir a propiedade.\n"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+#, fuzzy
+msgid "Properties failed"
+msgstr "fallou execvp"
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Valor"
@@ -1059,8 +1364,8 @@ msgstr "Valor"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
#, fuzzy
msgid "Self"
msgstr "Propio"
@@ -1071,11 +1376,11 @@ msgstr "Propio"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
#, fuzzy
msgid "Immediate files"
-msgstr "Exportando %d ficheiros"
+msgstr "Todos os ficheros"
#. Translators: svn recursion selection
#. * Recursive means the update is full recursive
@@ -1083,177 +1388,93 @@ msgstr "Exportando %d ficheiros"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
-msgstr "Amosar/Agochar"
+msgstr "Recursiva"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
+#: ../tvp-svn-helper/tsh-relocate.c:71
#, fuzzy
-msgid "Set property failed"
-msgstr "Establecer as propiedades do sinal"
+msgid "Relocate failed"
+msgstr "fallou execvp"
-#: tvp-svn-helper/tsh-properties.c:104
+#: ../tvp-svn-helper/tsh-relocate.c:86
#, fuzzy
-msgid "Properties failed"
+msgid "Relocate finished"
+msgstr "A función terminou\n"
+
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
msgid "_From:"
msgstr "_Dende:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Seleccione un cartafol"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr "_A:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Directorio:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
-#, fuzzy
-msgid "Relocate failed"
-msgstr ""
-"Erro ao abrir '%s':\n"
-"\n"
-"%s"
-
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-status.c:86
#, fuzzy
-msgid "Relocate finished"
-msgstr "Debuxo rematado"
-
-#: tvp-svn-helper/tsh-relocate.c:128
-msgid "Relocating ..."
-msgstr ""
+msgid "Status failed"
+msgstr "Fallou"
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
#, fuzzy
msgid "Show Unmodified Files"
-msgstr "Mostrar os ficheiros binarios"
+msgstr "Amosar fic_heiros agochados"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
#, fuzzy
msgid "Show Unversioned Files"
-msgstr "Mostrar os ficheiros binarios"
+msgstr "Non mostrar ficheiros sen versión"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
#, fuzzy
msgid "Show Ignored Files"
-msgstr "Mostrar os ficheiros binarios"
+msgstr "Amosar fic_heiros agochados"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
#, fuzzy
msgid "Hide Externals"
-msgstr "Agochar o obxecto"
+msgstr "_Ocultar os camiños"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Comprobar o repositorio"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-#, fuzzy
-msgid "Status failed"
-msgstr "Fallou"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repositorio:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Transferir"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "O certificado xa non é válido."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "O certificado caducou."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "O certificado non coincide co nome de máquina remoto."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "A autoridade do certificado é descoñecida."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Outro fallo."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Confiar"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "Desface-la última acción"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Desface-la última acción"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "A función terminou\n"
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr ""
-"[OPCIÓNS...] [FICHEIRO...]\n"
-"\n"
-"Opcións dispoñibles:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Reverter"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Debuxo rematado"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "Engadindo..."
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s en %2$s"
diff --git a/po/hu.po b/po/hu.po
index 6c604a0..7a36175 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar SVN plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2007-06-04 08:37+0100\n"
"Last-Translator: SZERVÁC Attila <sas at 321.hu>\n"
"Language-Team: Hungarian\n"
@@ -13,328 +13,510 @@ msgstr ""
"X-Poedit-Language: Hungarian\n"
"X-Poedit-Country: HUNGARY\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Hozzáad"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "SVN _Checkout"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "SVN _Checkout"
+msgid "Menu|Branch"
+msgstr "Vált"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
#, fuzzy
msgid "Menu|Checkout"
msgstr "SVN _Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
#, fuzzy
msgid "Checkout"
msgstr "SVN _Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
#, fuzzy
-msgid "Menu|Cleanup"
+msgid "Menu|Clean"
msgstr "Tisztít"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Tisztít"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Kész"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+#, fuzzy
+msgid "Menu|Diff"
+msgstr "Különbség"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Különbség"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Vált"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Tisztít"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Adatok"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Napló"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Töröl"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Töröl"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Töröl"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Állapot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Megold"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Visszaállít"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Visszaállít"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Visszaállít"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Megold"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Megold"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Vált"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Állapot"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Állapot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+#, fuzzy
+msgid "Menu|Status"
+msgstr "Állapot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Állapot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Állapot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr ""
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "SVN _Checkout"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+#, fuzzy
+msgid "Menu|Cleanup"
+msgstr "Tisztít"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Tisztít"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
#, fuzzy
msgid "Menu|Copy"
msgstr "Kész"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
#, fuzzy
msgid "Copy"
msgstr "Kész"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
#, fuzzy
msgid "Menu|Delete"
msgstr "Töröl"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Töröl"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-#, fuzzy
-msgid "Menu|Diff"
-msgstr "Különbség"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Különbség"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
#, fuzzy
msgid "Menu|Export"
msgstr "Export"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Export"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
#, fuzzy
msgid "Menu|Import"
msgstr "SVN _Import"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
#, fuzzy
msgid "Import"
msgstr "SVN _Import"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
#, fuzzy
msgid "Menu|Info"
msgstr "Adatok"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Adatok"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
#, fuzzy
msgid "Menu|Lock"
msgstr "Zár"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Zár"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Napló"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
#, fuzzy
msgid "Menu|Edit Properties"
msgstr "Tulajdonságok szerkesztése"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Tulajdonságok szerkesztése"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
#, fuzzy
msgid "Menu|Relocate"
msgstr "Töröl"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
#, fuzzy
msgid "Menu|Resolved"
msgstr "Megold"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
#, fuzzy
msgid "Resolved"
msgstr "Megold"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
#, fuzzy
msgid "Menu|Resolve"
msgstr "Megold"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Megold"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
#, fuzzy
msgid "Menu|Revert"
msgstr "Visszaállít"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Visszaállít"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-#, fuzzy
-msgid "Menu|Status"
-msgstr "Állapot"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Állapot"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
#, fuzzy
msgid "Menu|Switch"
msgstr "Vált"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Vált"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
#, fuzzy
msgid "Menu|Unlock"
msgstr "Felold"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Felold"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
#, fuzzy
msgid "Menu|Update"
msgstr "Frissít"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Frissít"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
#, fuzzy
msgid "Revision:"
msgstr "E verziónál: %li"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
#, fuzzy
msgid "Repository:"
msgstr "Megold"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr ""
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr ""
@@ -347,612 +529,805 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Verzió kiírása"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
#, fuzzy
msgid "Execute add action"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
#, fuzzy
msgid "Execute blame action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Checkout művelet futtatása"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Checkout művelet futtatása"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+#, fuzzy
+msgid "Execute log action"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+#, fuzzy
+msgid "Execute move action"
+msgstr "Checkout művelet futtatása"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Checkout művelet futtatása"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+#, fuzzy
+msgid "Execute status action"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+#, fuzzy
+msgid "Blame Related Options:"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Frissítési művelet futtatása"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+#, fuzzy
+msgid "Line"
+msgstr "Bejelentkezés"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+#, fuzzy
+msgid "Revision"
+msgstr "E verziónál: %li"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+#, fuzzy
+msgid "Date"
+msgstr "Állapot"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Útvonal"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+msgid "Excldue ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+msgid "Include ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+msgid "Only ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Tisztít"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Tisztít"
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+msgid "AuthorDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+msgid "CommitDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+#, fuzzy
+msgid "Message"
+msgstr "Töröl"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "SVN _Checkout"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Tisztít"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:151
+msgid "Move ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Művelet"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Tisztít"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Visszaállít"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr ""
+
+#: ../tvp-svn-helper/main.c:124
#, fuzzy
msgid "Execute changelist action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
#, fuzzy
msgid "Execute cleanup action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
#, fuzzy
msgid "Execute commit action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
#, fuzzy
msgid "Execute copy action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
#, fuzzy
msgid "Execute delete action"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
#, fuzzy
msgid "Execute export action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
#, fuzzy
msgid "Execute import action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
#, fuzzy
msgid "Execute lock action"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:178
-#, fuzzy
-msgid "Execute log action"
-msgstr "Frissítési művelet futtatása"
-
-#: tvp-svn-helper/main.c:184
-#, fuzzy
-msgid "Execute move action"
-msgstr "Checkout művelet futtatása"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
#, fuzzy
msgid "Execute properties action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
#, fuzzy
msgid "Execute resolved action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
#, fuzzy
msgid "Execute relocate action"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
#, fuzzy
msgid "Execute revert action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-#, fuzzy
-msgid "Execute status action"
-msgstr "Frissítési művelet futtatása"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
#, fuzzy
msgid "Execute switch action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
#, fuzzy
msgid "Execute unlock action"
msgstr "Checkout művelet futtatása"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:250
-#, fuzzy
-msgid "Blame Related Options:"
-msgstr "Frissítési művelet futtatása"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
#, fuzzy
msgid "Changelist Related Options:"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
#, fuzzy
msgid "Checkout Related Options:"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
#, fuzzy
msgid "Properties Related Options:"
msgstr "Tulajdonságok szerkesztése"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
#, fuzzy
msgid "Properties"
msgstr "Tulajdonságok szerkesztése"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
#, fuzzy
msgid "Relocate Related Options:"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
#, fuzzy
msgid "Switch Related Options:"
msgstr "Frissítési művelet futtatása"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr ""
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-#, fuzzy
-msgid "Line"
-msgstr "Bejelentkezés"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-#, fuzzy
-msgid "Revision"
-msgstr "E verziónál: %li"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-#, fuzzy
-msgid "Date"
-msgstr "Állapot"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
#, fuzzy
msgid "Blame failed"
msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
#, fuzzy
msgid "Cleanup failed"
msgstr "Tisztít"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
#, fuzzy
msgid "Cleanup finished"
msgstr "Tisztít"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
#, fuzzy
msgid "Cleaning up ..."
msgstr "Tisztít"
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, fuzzy, c-format
msgid "At revision: %ld"
msgstr "E verziónál: %li"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Kész"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Hozzáadva"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
#, fuzzy
msgid "Copied"
msgstr "Kész"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Törölve"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
#, fuzzy
msgid "Restored"
msgstr "Megold"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
#, fuzzy
msgid "Reverted"
msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
#, fuzzy
msgid "Revert failed"
msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Frissítve"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Külső"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
#, fuzzy
msgid "Locked"
msgstr "Zár"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
#, fuzzy
msgid "Unlocked"
msgstr "Felold"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
#, fuzzy
msgid "Unlock failed"
msgstr "Felold"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Tulajdonságok szerkesztése"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Tulajdonságok szerkesztése"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Tulajdonságok szerkesztése"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Tulajdonságok szerkesztése"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Kész"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Kész"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Külső"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
#, fuzzy
msgid "Conflicted"
msgstr "Kész"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
#, fuzzy
msgid "Incomplete"
msgstr "Kész"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
#, fuzzy
msgid "Delete Message"
msgstr "Töröl"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Emlékezz"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr ""
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Útvonal"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
#, fuzzy
msgid "Import Message"
msgstr "Töröl"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-#, fuzzy
-msgid "Message"
-msgstr "Töröl"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Művelet"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-#, fuzzy
-msgid "State"
-msgstr "Állapot"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
#, fuzzy
msgid "Log failed"
msgstr "Felold"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "Felhasználónév:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "Jelszó:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Bejelentkezés"
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+#, fuzzy
+msgid "State"
+msgstr "Állapot"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime típus"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr ""
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+#, fuzzy
+msgid "Set property failed"
+msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+#, fuzzy
+msgid "Properties failed"
+msgstr "Tulajdonságok szerkesztése"
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr ""
@@ -962,8 +1337,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -973,8 +1348,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
#, fuzzy
msgid "Immediate files"
msgstr "Visszaállít"
@@ -985,163 +1360,96 @@ msgstr "Visszaállít"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
msgstr "Megold"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
+#: ../tvp-svn-helper/tsh-relocate.c:71
#, fuzzy
-msgid "Set property failed"
+msgid "Relocate failed"
msgstr "Visszaállít"
-#: tvp-svn-helper/tsh-properties.c:104
+#: ../tvp-svn-helper/tsh-relocate.c:86
#, fuzzy
-msgid "Properties failed"
-msgstr "Tulajdonságok szerkesztése"
+msgid "Relocate finished"
+msgstr "Tisztít"
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr ""
+#: ../tvp-svn-helper/tsh-relocate.c:128
+#, fuzzy
+msgid "Relocating ..."
+msgstr "Tisztít"
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-status.c:86
#, fuzzy
-msgid "Relocate failed"
-msgstr "Visszaállít"
-
-#: tvp-svn-helper/tsh-relocate.c:86
-#, fuzzy
-msgid "Relocate finished"
-msgstr "Tisztít"
-
-#: tvp-svn-helper/tsh-relocate.c:128
-#, fuzzy
-msgid "Relocating ..."
-msgstr "Tisztít"
+msgid "Status failed"
+msgstr "Állapot"
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
#, fuzzy
msgid "Hide Externals"
msgstr "Külső"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-#, fuzzy
-msgid "Status failed"
-msgstr "Állapot"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr ""
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Checkout művelet futtatása"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Checkout művelet futtatása"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Frissítési művelet futtatása"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Frissítési művelet futtatása"
+#~ msgid "Execute remove action"
+#~ msgstr "Checkout művelet futtatása"
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
#, fuzzy
-msgid "Reset"
-msgstr "Visszaállít"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Frissítési művelet futtatása"
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "Tisztít"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Tisztít"
#, fuzzy
#~ msgid "Modify Property Recursive"
diff --git a/po/id.po b/po/id.po
index e93d4eb..b132801 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-04-09 21:38-0400\n"
"Last-Translator: Andhika Padmawan <andhika.padmawan at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -15,303 +15,486 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Tambah"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Tambah"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Salahkan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Salahkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Salahkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "Senarai Ubah"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "Salahkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Senarai Ubah"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Cek Keluar"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Cek keluar"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Bersihkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Bersihkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Salin"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Terapkan "
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Terapkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Beda"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Beda"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Ganti"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Bersihkan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Info"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Ketakterhinggaan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Catatan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Catatan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Pindah"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Dimerger"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Pindah"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Pindah"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Salahkan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Benah"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Kembalikan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Kembalikan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Kembalikan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Benah"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Benah"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Catatan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Catatan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Aksi %s tak diimplementasikan"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Senarai Ubah"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Senarai Ubah"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Bersihkan"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Bersihkan"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Salin"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Salin"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Hapus"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Hapus"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Beda"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Beda"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Ekspor"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Ekspor"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Impor"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Impor"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Kunci"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Kunci"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Catatan"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Catatan"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Pindah"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Pindah"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Sunting Properti"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Sunting Properti"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Relokasi"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Relokasi"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Benahi"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Benahi"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Benah"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Benah"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Kembalikan"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Kembalikan"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Ganti"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Ganti"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Buka Kunci"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Buka Kunci"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Mutakhirkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Mutakhirkan"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Aksi %s tak diimplementasikan"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Tak Diketahui"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revisi:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Gudang:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Revisi dimodifikasi:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Tanggal dimodifikasi:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Penulis:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Senarai Ubah:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Kedalaman:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "Kecualikan"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "Kosong"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Berkas"
@@ -324,565 +507,762 @@ msgstr "Berkas"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "Segera"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "Ketakterhinggaan"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Cetak informasi versi"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Eksekusi aksi tambah"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Eksekusi aksi salahkan"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Eksekusi aksi salahkan"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Eksekusi aksi bersihkan"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Eksekusi aksi catatan"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Eksekusi aksi catatan"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Eksekusi aksi pindah"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Eksekusi aksi kembalikan"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Eksekusi aksi status"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Eksekusi aksi status"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Opsi Tambah Terkait:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Opsi Terkait Salahkan:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Opsi Terkait Salahkan:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Opsi Salin Terkait:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Opsi Catatan Terkait:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Opsi Pindah Terkait:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Opsi Kembalikan Terkait:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Opsi Status Terkait:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Opsi Status Terkait:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Jalur"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revisi"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Penulis"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Tanggal"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Alamat"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Tampilkan Berkas yang Diabaikan"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Tampilkan Berkas yang Diabaikan"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Tampilkan Berkas yang Diabaikan"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Bersihkan selesai"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Membersihkan ..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Gagal"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Pilih/Tak Pilih semua"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Penulis"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Terapkan"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Pesan"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Diubah"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Berkas"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Bersihkan selesai"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Pinda Ke"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Pindah"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Aksi"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Relokasi selesai"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Kembalikan"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nama"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Gudang:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Pilih folder"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Direktori:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Transfer"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "Eksekusi aksi senarai ubah"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Eksekusi aksi cek keluar"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Eksekusi aksi bersihkan"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Eksekusi aksi terapkan"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Eksekusi aksi salin"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Eksekusi aksi hapus"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Eksekusi aksi ekspor"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Eksekusi aksi impor"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Eksekusi aksi kunci"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Eksekusi aksi catatan"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Eksekusi aksi pindah"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Eksekusi aksi properti"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Eksekusi aksi benahi"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Eksekusi aksi relokasi"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Eksekusi aksi kembalikan"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Eksekusi aksi status"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Eksekusi aksi ganti"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Eksekusi aksi buka kunci"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Eksekusi aksi mutakhirkan"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Opsi Tambah Terkait:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Opsi Terkait Salahkan:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "Opsi Terkait Senarai Ubah:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Opsi Terkait Cek Keluar:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Opsi Bersihkan Terkait:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Opsi Terapkan Terkait:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Opsi Salin Terkait:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Opsi Hapus Terkait:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Opsi Ekspor Terkait:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Opsi Impor Terkait:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Opsi Kunci Terkait:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Opsi Catatan Terkait:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Opsi Pindah Terkait:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Opsi Properti Terkait:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Properti"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Opsi Benahi Terkait:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Opsi Terkait Relokasi:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Opsi Kembalikan Terkait:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Opsi Status Terkait:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Opsi Ganti Terkait:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Opsi Buka Kunci Terkait:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Opsi Mutakhirkan Terkait:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Argumen yang diberikan tak cukup"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Gagal"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Jalur"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revisi"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Penulis"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Tanggal"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Salahkan gagal"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Bersihkan gagal"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Bersihkan selesai"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Membersihkan ..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Di revisi: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Tak ada yang dikerjakan"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Selesai"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Pesan Terapkan"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Ditambah"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Disalin"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Dihapus"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Disimpan ulang"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Dikembalikan"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Kembalikan gagal"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Dilewati"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Dimutakhirkan"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Eksternal"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Dimodifikasi"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Diganti"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Mentransmisikan"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Terkunci"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Kunci dibuka"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Gagal mengunci"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Gagal membuka kunci"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Ada"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "Atur senarai ubah"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "Senarai ubah dibersihkan"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "Senarai ubah dipindah"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "Penggabungan dimulai"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "Penggabungan asing dimulai"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Ganti"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Properti gagal"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Properti gagal"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Properti gagal"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Properti"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Atur properti gagal"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Atur properti gagal"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Selesai"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Konflik"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Eksternal"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Tak dapat diterapkan"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Tak diubah"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Hilang"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Rintangan"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Diubah"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Dimerger"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Konflik"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Diabaikan"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Tidak selesai"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Salinan lokal"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Salin Ke"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Hapus lokal"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Hapus Pesan"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Sertifikat"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Pilih berkas"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Ingat"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Sertifikat"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Alamat"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Pilih/Tak Pilih semua"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Impor Pesan"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Pesan"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Aksi"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Berkas"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Tingkat"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Pesan Log"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Log gagal"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Nama pengguna:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Sandi lewat:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Log masuk"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Tingkat"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Pesan Log"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Pindah lokal"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Pinda Ke"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipe mime"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Pemberitahuan"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nama"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Atur properti gagal"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Properti gagal"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Nilai"
@@ -892,8 +1272,8 @@ msgstr "Nilai"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "Sendiri"
@@ -903,8 +1283,8 @@ msgstr "Sendiri"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "Berkas segera"
@@ -914,155 +1294,90 @@ msgstr "Berkas segera"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "Rekursif"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Atur properti gagal"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Properti gagal"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_Dari:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Pilih folder"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Ke:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Direktori:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Relokasi gagal"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Relokasi selesai"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Merelokasi ..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_Dari:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Ke:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status gagal"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Tampilkan Berkas yang Tidak Dimodifikasi"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Tampilkan Berkas yang Tidak Memiliki Versi"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Tampilkan Berkas yang Diabaikan"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Sembunyikan Eksternal"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Cek Gudang"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Status gagal"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Gudang:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Transfer"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Sertifikat belum sah."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Sertifikat telah kadaluarsa."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "Sertifikat tidak cocok dengan nama host jarak jauh."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "Otoritas sertifikat tak diketahui."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Kesalahan lainnya."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Percaya"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "Eksekusi aksi salahkan"
+#~ msgid "Execute remove action"
+#~ msgstr "Eksekusi aksi pindah"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "Eksekusi aksi kembalikan"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Opsi Terkait Salahkan:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "Opsi Benahi Terkait:"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Opsi Kembalikan Terkait:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Kembalikan"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Bersihkan selesai"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Bersihkan selesai"
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s di %2$s"
diff --git a/po/lv.po b/po/lv.po
index 3afac05..edc6ee9 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,345 +1,505 @@
# rench translations for hunar-svn-plugin package
# Copyright (C) 2007 THE thunar-svn-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the thunar-svn-plugin package.
-# Rihards Prieditis <rprieditis at inbox.lv>, 2007.
#
+# Rihards Prieditis <rprieditis at inbox.lv>, 2007.
+# Rihards Prieditis <rprieditis at gmail.com>, 2009.
msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
-"PO-Revision-Date: 2007-11-15 21:18+0300\n"
-"Last-Translator: Rihards Priedītis <rprieditis at inbox.lv>\n"
-"Language-Team: Latvian <rprieditis at inbox.lv>\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
+"PO-Revision-Date: 2009-09-18 21:21+0100\n"
+"Last-Translator: Rihards Prieditis <rprieditis at gmail.com>\n"
+"Language-Team: Latvian <translation-team-lv at lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
-msgstr ""
+msgstr "Pievienot"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Pievienot"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Vainot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Vainot"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Vainot"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Izrakstīt"
+msgid "Menu|Branch"
+msgstr "Atzars"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr ""
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr "Atzars"
-#: thunar-vcs-plugin/tvp-svn-action.c:320
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Izrakstīt"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Izrakstīt"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
#, fuzzy
-msgid "Menu|Cleanup"
+msgid "Menu|Clean"
msgstr "Uzkopt"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Uzkopt"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
#, fuzzy
+msgid "Menu|Clone"
+msgstr "Kopēt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
-msgstr "Apstiprināt"
+msgstr "Iesniegt"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
-msgstr "Apstiprināt"
+msgstr "Iesniegt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Atšķirība"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Atšķirība"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
#, fuzzy
-msgid "Menu|Copy"
-msgstr "Pabeigts"
+msgid "Menu|Fetch"
+msgstr "Pārslēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
#, fuzzy
-msgid "Copy"
-msgstr "Pabeigts"
+msgid "Menu|Grep"
+msgstr "Uzkopt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
#, fuzzy
-msgid "Menu|Delete"
-msgstr "Dzēst"
+msgid "Menu|Init"
+msgstr "Informācija"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
-msgid "Delete"
-msgstr "Dzēst"
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Bezgalīgi"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Reģistrēt"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Reģistrēt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
#, fuzzy
-msgid "Menu|Diff"
-msgstr "Atšķirība"
+msgid "Menu|Merge"
+msgstr "Pārvietot"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Atšķirība"
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Apvienots"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Pārvietot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Pārvietot"
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
#, fuzzy
+msgid "Menu|Pull"
+msgstr "Vainot"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Atrisināt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Atstatīt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Atgriezt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr "Atstatīt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Atrisināt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Atrisināt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Reģistrēt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Reģistrēt"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Darbība %s nav izstrādāta"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr "GIT"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Izmaiņu saraksts"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Izmaiņu saraksts"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Uzkopt"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Uzkopt"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
+msgid "Menu|Copy"
+msgstr "Kopēt"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
+msgid "Copy"
+msgstr "Kopēt"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
+msgid "Menu|Delete"
+msgstr "Dzēst"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
+msgid "Delete"
+msgstr "Dzēst"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Eksportēt"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Eksportēt"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
-msgstr "SVN _Imports"
+msgstr "Imports"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
-msgstr "SVN _Imports"
+msgstr "Imports"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Informācija"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informācija"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Slēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Slēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Reģistrēt"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rediģēt rekvizītus"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rediģēt rekvizītus"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
-msgstr "Dzēst"
+msgstr "Atiedalīt"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
-msgstr ""
+msgstr "Atiedalīt"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
-msgstr "Atpazīt"
+msgstr "Atrisināts"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
-msgstr "Atpazīt"
+msgstr "Atrisināts"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
-msgstr "Atpazīt"
+msgstr "Atrisināt"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
-msgstr "Atpazīt"
+msgstr "Atrisināt"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Atgriezt"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Atgriezt"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-#, fuzzy
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Pārslēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Pārslēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Atslēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Atslēgt"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Atjaunot"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Atjaunot"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+msgstr "URL:"
+
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
-msgstr ""
+msgstr "Nezināms"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
-msgstr "Revizija: %li"
+msgstr "Revīzija:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
-#, fuzzy
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
-msgstr "Atpazīt"
+msgstr "Repozitorijs:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
-msgstr ""
+msgstr "Modifikācijas revīzija:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
-msgstr ""
+msgstr "Modifikācijas datums:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
-msgstr ""
+msgstr "Autors:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
-msgstr ""
+msgstr "Izmaiņu saraksts:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
-msgstr ""
+msgstr "Dziļums:
"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
-msgstr ""
+msgstr "Izkļaut"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
-msgstr ""
+msgstr "Tukšs"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
-msgstr ""
+msgstr "Faili"
#. Translators: svn recursion depth infotmation
#. * Immediates depth means this file/direcotry and all of it's files and subdirectories are checked out
@@ -350,617 +510,751 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
-msgstr ""
+msgstr "Tūlītējs"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
-msgstr ""
+msgstr "Bezgalīgi"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Izdrukāt versijas informāciju"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
-#, fuzzy
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
-msgstr "Izpildīt atjaunošanas darbību"
+msgstr "Izpildīt pievienošanas darbību"
-#: tvp-svn-helper/main.c:118
-#, fuzzy
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgstr "Izpildīt vainošanas darbību"
-#: tvp-svn-helper/main.c:124
-#, fuzzy
-msgid "Execute changelist action"
-msgstr "Izpildīt izrakstīšanas darbību"
-
-#: tvp-svn-helper/main.c:130
-msgid "Execute checkout action"
-msgstr "Izpildīt izrakstīšanas darbību"
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr "Izpildīt atzarošanas darbību"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-git-helper/main.c:103
#, fuzzy
-msgid "Execute cleanup action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Execute clean action"
+msgstr "Izpildīt uzkopšanas darbību"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-git-helper/main.c:109
#, fuzzy
-msgid "Execute commit action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Execute clone action"
+msgstr "Izpildīt reģistrēšanas darbību"
-#: tvp-svn-helper/main.c:148
-#, fuzzy
-msgid "Execute copy action"
-msgstr "Izpildīt izrakstīšanas darbību"
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Izpildīt reģistrēšanas darbību"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Izpildīt pārvietošanas darbību"
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr "Izpildīt atstatīšanas darbību"
+
+#: ../tvp-git-helper/main.c:133
#, fuzzy
-msgid "Execute delete action"
-msgstr "Izpildīt atjaunošanas darbību"
+msgid "Execute stash action"
+msgstr "Izpildīt statusa darbību"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Izpildīt statusa darbību"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Pievienot saistītās opcijas:"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Vainot saistītās opcijas:"
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr "Atzara saistītas opcijas:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
#, fuzzy
-msgid "Execute export action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Clone Related Options:"
+msgstr "Kopēšanas saistītās opcijas:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Reģistrēšanas saistītās opcijas:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Pārvietošanas saistītās opcijas:"
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr "Atstatīšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-git-helper/main.c:183
#, fuzzy
-msgid "Execute import action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Stash Related Options:"
+msgstr "Statusa saistītās opcijas:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Statusa saistītās opcijas:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Rinda"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revīzija"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autors"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Datums"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Ceļš"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
#, fuzzy
-msgid "Execute lock action"
-msgstr "Izpildīt atjaunošanas darbību"
+msgid "Excldue ignored files"
+msgstr "Rādīt ignorētos failus"
-#: tvp-svn-helper/main.c:178
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
#, fuzzy
-msgid "Execute log action"
-msgstr "Izpildīt atjaunošanas darbību"
+msgid "Include ignored files"
+msgstr "Rādīt ignorētos failus"
-#: tvp-svn-helper/main.c:184
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
#, fuzzy
-msgid "Execute move action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Only ignored files"
+msgstr "Rādīt ignorētos failus"
-#: tvp-svn-helper/main.c:190
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
#, fuzzy
-msgid "Execute properties action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Clone finished"
+msgstr "Uzkopšana pabeigta"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-git-helper/tgh-clone.c:123
#, fuzzy
-msgid "Execute resolved action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Cloning ..."
+msgstr "Uzkopšana..."
-#: tvp-svn-helper/main.c:202
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Neizdevās"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr "neseko"
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Atlasīt visu/Atcelt atlasi"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
#, fuzzy
-msgid "Execute relocate action"
-msgstr "Izpildīt atjaunošanas darbību"
+msgid "AuthorDate"
+msgstr "Autors"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-git-helper/tgh-log-dialog.c:143
#, fuzzy
-msgid "Execute revert action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "CommitDate"
+msgstr "Iesniegt"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Ziņa"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
#, fuzzy
-msgid "Execute status action"
-msgstr "Izpildīt atjaunošanas darbību"
+msgid "Changes"
+msgstr "Mainīts"
-#: tvp-svn-helper/main.c:220
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Fails"
+
+#: ../tvp-git-helper/tgh-move.c:58
#, fuzzy
-msgid "Execute switch action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Move finished"
+msgstr "Uzkopšana pabeigta"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Pārvietot uz"
+
+#: ../tvp-git-helper/tgh-move.c:151
#, fuzzy
-msgid "Execute unlock action"
-msgstr "Izpildīt izrakstīšanas darbību"
+msgid "Move ..."
+msgstr "Pārvietot"
-#: tvp-svn-helper/main.c:232
-msgid "Execute update action"
-msgstr "Izpildīt atjaunošanas darbību"
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Darbība"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
msgstr ""
-#: tvp-svn-helper/main.c:250
+#: ../tvp-git-helper/tgh-reset.c:58
#, fuzzy
-msgid "Blame Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
+msgid "Reset finished"
+msgstr "Atiedalīšana pabeigta"
-#: tvp-svn-helper/main.c:254
+#: ../tvp-git-helper/tgh-reset.c:143
#, fuzzy
+msgid "Reset ..."
+msgstr "Atstatīt"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nosaukums"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repozitorijs:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Atlasiet mapi"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Direktorija:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Pārvietot"
+
+#: ../tvp-svn-helper/main.c:124
+msgid "Execute changelist action"
+msgstr "Izpildīt izmaiņu saraksta darbību"
+
+#: ../tvp-svn-helper/main.c:130
+msgid "Execute checkout action"
+msgstr "Izpildīt izrakstīšanas darbību"
+
+#: ../tvp-svn-helper/main.c:136
+msgid "Execute cleanup action"
+msgstr "Izpildīt uzkopšanas darbību"
+
+#: ../tvp-svn-helper/main.c:142
+msgid "Execute commit action"
+msgstr "Izpildīt iesniegšanas darbību"
+
+#: ../tvp-svn-helper/main.c:148
+msgid "Execute copy action"
+msgstr "Izpildīt kopēšanas darbību"
+
+#: ../tvp-svn-helper/main.c:154
+msgid "Execute delete action"
+msgstr "Izpildīt dzēšanas darbību"
+
+#: ../tvp-svn-helper/main.c:160
+msgid "Execute export action"
+msgstr "Izpildīt eksportēšanas darbību"
+
+#: ../tvp-svn-helper/main.c:166
+msgid "Execute import action"
+msgstr "Izpildīt importēšanas darbību"
+
+#: ../tvp-svn-helper/main.c:172
+msgid "Execute lock action"
+msgstr "Izpildīt noslēgšanas darbību"
+
+#: ../tvp-svn-helper/main.c:190
+msgid "Execute properties action"
+msgstr "Izpildīt rekvizītu darbību"
+
+#: ../tvp-svn-helper/main.c:196
+msgid "Execute resolved action"
+msgstr "Izpildīt atrisināts darbību"
+
+#: ../tvp-svn-helper/main.c:202
+msgid "Execute relocate action"
+msgstr "Izpildīt atiedalīt darbību"
+
+#: ../tvp-svn-helper/main.c:208
+msgid "Execute revert action"
+msgstr "Izpildīt atgriezt darbību"
+
+#: ../tvp-svn-helper/main.c:220
+msgid "Execute switch action"
+msgstr "Izpildīt pārslēgšanas darbību"
+
+#: ../tvp-svn-helper/main.c:226
+msgid "Execute unlock action"
+msgstr "Izpildīt atslēgt darbību"
+
+#: ../tvp-svn-helper/main.c:232
+msgid "Execute update action"
+msgstr "Izpildīt atjaunot darbību"
+
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
+msgstr "Izmaiņu saraksta saistītās opcijas:"
-#: tvp-svn-helper/main.c:258
-#, fuzzy
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
+msgstr "Izrakstīšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
-msgstr ""
+msgstr "Uzkopšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
-msgstr ""
+msgstr "Iesniegšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
-msgstr ""
+msgstr "Kopēšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
-msgstr ""
+msgstr "Dzēšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
-msgstr ""
+msgstr "Eksporta saistītās opcijas:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
-msgstr ""
+msgstr "Importa saistītās opcijas:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
-msgstr ""
+msgstr "Noslēgšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
-#, fuzzy
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rekvizītu saistītās opcijas:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
-#, fuzzy
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rekvizīti"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
-msgstr ""
+msgstr "Atrisināts saistītās opcijas:"
-#: tvp-svn-helper/main.c:306
-#, fuzzy
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
+msgstr "Atiedalīt saistītās opcijas:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
-msgstr ""
+msgstr "Atgriezt saistītās opcijas:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
-#, fuzzy
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
+msgstr "Pārslēgšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
-msgstr ""
+msgstr "Atslēgšanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
-msgstr ""
+msgstr "Atjaunošanas saistītās opcijas:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
-msgstr ""
-
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-#, fuzzy
-msgid "Line"
-msgstr "Pieteikties"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-#, fuzzy
-msgid "Revision"
-msgstr "Revizija: %li"
+msgstr "Nav norādīti pietiekams argumentu daudzums"
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-#, fuzzy
-msgid "Date"
-msgstr "Status"
-
-#: tvp-svn-helper/tsh-blame.c:75
-#, fuzzy
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
-msgstr "Atgriezt"
+msgstr "Vainot neizdevās"
-#: tvp-svn-helper/tsh-cleanup.c:66
-#, fuzzy
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
-msgstr "Uzkopt"
+msgstr "Uzkopt neizdevās"
-#: tvp-svn-helper/tsh-cleanup.c:81
-#, fuzzy
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
-msgstr "Uzkopt"
+msgstr "Uzkopšana pabeigta"
-#: tvp-svn-helper/tsh-cleanup.c:95
-#, fuzzy
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
-msgstr "Uzkopt"
+msgstr "Uzkopšana..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, fuzzy, c-format
msgid "At revision: %ld"
-msgstr "Revizija: %li"
+msgstr "Revīzija:"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
-msgstr ""
+msgstr "Nav ko darīt"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Pabeigts"
-#: tvp-svn-helper/tsh-commit.c:145
-#, fuzzy
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
-msgstr "Apstiprināt"
+msgstr "Iesniegšanas ziņa"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
-msgstr ""
+msgstr "Glabāt paroli kā atklātu tekstu?"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Pievienots"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
-msgstr "Pabeigts"
+msgstr "Nokopēts"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Dzēsts"
-#: tvp-svn-helper/tsh-common.c:497
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
-msgstr "Atpazīt"
+msgstr "Atjaunots"
-#: tvp-svn-helper/tsh-common.c:498
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
-msgstr "Atgriezt"
+msgstr "Atgrieztais"
-#: tvp-svn-helper/tsh-common.c:499
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
-msgstr "Atgriezt"
+msgstr "Atgriešana neizdevās"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
-msgstr ""
+msgstr "Izlaists"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Atjaunināts"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Ārējs"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
-msgstr ""
+msgstr "Modificēts"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
-msgstr ""
+msgstr "Aizvietos"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
-msgstr ""
+msgstr "Pārraida"
-#: tvp-svn-helper/tsh-common.c:515
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Slēgt"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Atslēgt"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
-msgstr ""
+msgstr "Slēgšana neizdevās"
-#: tvp-svn-helper/tsh-common.c:518
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
-msgstr "Atslēgt"
+msgstr "Atslēgšana neizdevās"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
-msgstr ""
+msgstr "Eksistē"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
-msgstr ""
+msgstr "Izmaiņu saraksta komplekts"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
-msgstr ""
+msgstr "Izmaiņu saraksts notīrīts"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
-msgstr ""
+msgstr "Izmaiņu saraksts pārvietots"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
-msgstr ""
+msgstr "Apvienošana sākta"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
-msgstr ""
+msgstr "Ārzemnieka apvienošana sākta"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
-msgstr ""
+msgstr "Aizvietot"
-#: tvp-svn-helper/tsh-common.c:527
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rekvizīts pievienots"
-#: tvp-svn-helper/tsh-common.c:528
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rekvizīts modificēts"
-#: tvp-svn-helper/tsh-common.c:529
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Rekvizīts dzēsts"
-#: tvp-svn-helper/tsh-common.c:530
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
-msgstr "Rediģēt Rekvizītus"
+msgstr "Neeksistējošs rekvizīts"
-#: tvp-svn-helper/tsh-common.c:531
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
-msgstr "Atgriezt"
+msgstr "Revīzijas rekvizīts uzstādīts"
-#: tvp-svn-helper/tsh-common.c:532
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
-msgstr "Atgriezt"
+msgstr "Revīzijas rekvizīts dzēsts"
-#: tvp-svn-helper/tsh-common.c:533
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
-msgstr "Pabeigts"
+msgstr "Apvienošana pabeigta"
-#: tvp-svn-helper/tsh-common.c:534
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
-msgstr "Pabeigts"
+msgstr "Koka konflikts"
-#: tvp-svn-helper/tsh-common.c:535
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
-msgstr "Ārējs"
+msgstr "Ārējais neizdevās"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
-msgstr ""
+msgstr "Nepielietojams"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
-msgstr ""
+msgstr "Nemainīts"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
-msgstr ""
+msgstr "Trūkst"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
-msgstr ""
+msgstr "Traucēts"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
-msgstr ""
+msgstr "Mainīts"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
-msgstr ""
+msgstr "Apvienots"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
-msgstr "Pabeigts"
+msgstr "Konfliktēts"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
-msgstr ""
+msgstr "Parasts"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
-msgstr ""
+msgstr "Ignorēts"
-#: tvp-svn-helper/tsh-common.c:642
-#, fuzzy
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
-msgstr "Pabeigts"
+msgstr "Nepabeigts"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
-msgstr ""
+msgstr "Lokāla kopija"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
-msgstr ""
+msgstr "Kopēt uz"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
-msgstr ""
+msgstr "Lokāli dzēst"
-#: tvp-svn-helper/tsh-delete.c:145
-#, fuzzy
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
-msgstr "Apstiprināt"
+msgstr "Dzēšanas ziņa"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
-msgstr ""
+msgstr "_Sertifikāts:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
-msgstr ""
+msgstr "Atlasīt failu"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
-msgstr "Atceries"
+msgstr "Atcerēties"
-#: tvp-svn-helper/tsh-file-dialog.c:86
-#, fuzzy
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
-msgstr "Paziņošana"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Ceļš"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
+msgstr "Sertifikāts"
-#: tvp-svn-helper/tsh-import.c:125
-#, fuzzy
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
-msgstr "Apstiprināt"
-
-#: tvp-svn-helper/tsh-log-dialog.c:136
-#, fuzzy
-msgid "Message"
-msgstr "Apstiprināt"
+msgstr "Importa ziņa"
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Darbība"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-#, fuzzy
-msgid "State"
-msgstr "Status"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
-#, fuzzy
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
-msgstr "Atslēgt"
+msgstr "Reģistrēšana neizdevās"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Lietotāja vārds:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Parole:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Pieteikties"
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
-msgstr ""
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Stāvoklis"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr ""
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Reģistrēšanas ziņa"
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
+msgstr "Lokāla pārvietošana"
+
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime tips"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Paziņošana"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-#, fuzzy
-msgid "Name"
-msgstr "Vainot"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Rekvizīta uzstādīšana neizdevās"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Rekvizīts neizdevās"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
-msgstr ""
+msgstr "Vērtība"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is updated
@@ -968,10 +1262,10 @@ msgstr ""
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
-msgstr ""
+msgstr "Pats"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are updated
@@ -979,11 +1273,10 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
-#, fuzzy
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
-msgstr "Atgriezt"
+msgstr "Neatliekamie faili"
#. Translators: svn recursion selection
#. * Recursive means the update is full recursive
@@ -991,163 +1284,92 @@ msgstr "Atgriezt"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
-#, fuzzy
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
-msgstr "Atpazīt"
+msgstr "Rekursīvi"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-#, fuzzy
-msgid "Set property failed"
-msgstr "Atgriezt"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
+msgstr "Atiedalīšana neizdevās"
-#: tvp-svn-helper/tsh-properties.c:104
-#, fuzzy
-msgid "Properties failed"
-msgstr "Rediģēt Rekvizītus"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
+msgstr "Atiedalīšana pabeigta"
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr ""
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
+msgstr "Atiedalīšana..."
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr ""
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_No:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:71
-#, fuzzy
-msgid "Relocate failed"
-msgstr "Atgriezt"
+msgstr "_Uz:"
-#: tvp-svn-helper/tsh-relocate.c:86
-#, fuzzy
-msgid "Relocate finished"
-msgstr "Uzkopt"
-
-#: tvp-svn-helper/tsh-relocate.c:128
-#, fuzzy
-msgid "Relocating ..."
-msgstr "Uzkopt"
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status neizdevās"
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
-msgstr ""
+msgstr "Rādīt nemainītos failus"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
-msgstr ""
+msgstr "Rādīt bez versiju failus"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
-msgstr ""
+msgstr "Rādīt ignorētos failus"
-#: tvp-svn-helper/tsh-status-dialog.c:236
-#, fuzzy
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
-msgstr "Ārējs"
+msgstr "Slēpt ārējos"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
-msgstr ""
-
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-#, fuzzy
-msgid "Status failed"
-msgstr "Status"
+msgstr "Pārbaudīt repozitoriju"
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
-msgstr ""
+msgstr "Sertifikāts nav vēl derīgs."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
-msgstr ""
+msgstr "Sertifikātam ir iztecējis derīgums."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
-msgstr ""
+msgstr "Sertifikāts nesakrīt ar resursdatora nosaukumu."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
-msgstr ""
+msgstr "Sertifikātā autoritāte nav zināma."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
-msgstr ""
+msgstr "Cita kļūme."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
-msgstr ""
+msgstr "Uzticība"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "Izpildīt izrakstīšanas darbību"
+#~ msgid "Execute remove action"
+#~ msgstr "Izpildīt pārvietošanas darbību"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "Izpildīt izrakstīšanas darbību"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Atrisināts saistītās opcijas:"
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
+#~ msgid "Add finished"
+#~ msgstr "Pievienošana pabeigta"
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Izpildīt atjaunošanas darbību"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Atgriezt"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Uzkopt"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Adding ..."
+#~ msgstr "Pievieno ..."
#, fuzzy
#~ msgid "Modify Property Recursive"
diff --git a/po/nl.po b/po/nl.po
index 80cb75a..69d09e2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2008-06-12 00:44+0200\n"
"Last-Translator: Peter de Ridder <peter at xfce.org>\n"
"Language-Team: Dutch <xfce-i18n at xfce.org>\n"
@@ -15,303 +15,474 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Toevoegen"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Menu|Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Beschuldigen"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+msgid "Menu|Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Wijzigingslijst"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Ophalen"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
-msgstr ""
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
+msgstr "Samengevoegd"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Opschonen"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+msgid "Menu|Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Versturen"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Verschillen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Menu|Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Menu|Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Menu|Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "Oneindig"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Geschiedenis"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Samengevoegd"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Samengevoegd"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Verplaatsen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Menu|Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Menu|Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+msgid "Menu|Rebase"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Terug Halen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Terug Halen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Terug Halen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+msgid "Menu|Remove"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Verhelpen"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Menu|Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Terug Halen"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Menu|Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Actie %s is niet geimplementeerd"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Wijzigingslijst"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Opschonen"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Kopieeren"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Verwijderen"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Verschillen"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exporteren"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importeren"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informatie"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Vast Zetten"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Geschiedenis"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Verplaatsen"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Attributen Wijzigen"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Verplaatsen"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Opgelost"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Verhelpen"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Terug Halen"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Omschakelen"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Vrijgeven"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Bijwerken"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Actie %s is niet geimplementeerd"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Onbekend"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Versie:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Laatst aangepaste versie:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Datum van laatste aangepassing:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Auteur:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Wijzigingslijst:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "Diepte:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "Uitsluiten"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "Leeg"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Bestanden"
@@ -324,565 +495,762 @@ msgstr "Bestanden"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "Onderliggende"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "Oneindig"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Versie informatie tonen"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Toevoeg actie uitvoeren"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Beschuldig actie uitvoeren"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Beschuldig actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Opschoon actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Geschiedenis actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Geschiedenis actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Verplaats actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Terug haal actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Status actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Status actie uitvoeren"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Toevoegen gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Bechuldigen gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Bechuldigen gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Kopieer gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Geschiedenis gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Verplaats gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Terug haal gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Status gerelateerde opties:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Status gerelateerde opties:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Regel"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Versie"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Auteur"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Datum"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Pad"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Genegeerde bestanden weergeven"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Genegeerde bestanden weergeven"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Genegeerde bestanden weergeven"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Klaar met opschonen"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Bezig met opschonen ..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Gefaald"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Alles selecteren/deselecteren"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Auteur"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Versturen"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Bericht"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Gewijzigd"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Bestand"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Klaar met opschonen"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Verplaatsen naar"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Verplaatsen"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Actie"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Klaar met verplaatsen"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Terug Halen"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Naam"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Selecteer een map"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Map:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr ""
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr ""
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Ophaal actie uitvoeren"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Opschoon actie uitvoeren"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Verstuur actie uitvoeren"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Kopieer actie uitvoeren"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Verwijder actie uitvoeren"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Exporteer actie uitvoeren"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Importeer actie uitvoeren"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Vast zet actie uitvoeren"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Geschiedenis actie uitvoeren"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Verplaats actie uitvoeren"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Attributen actie uitvoeren"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Verholpen actie uitvoeren"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Verplaats actie uitvoeren"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Terug haal actie uitvoeren"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Status actie uitvoeren"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr ""
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Vrijgeef actie uitvoeren"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Bijwerk actie uitvoeren"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Toevoegen gerelateerde opties:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Bechuldigen gerelateerde opties:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Ophalen gerelateerde opties:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Opschonen gerelateerde opties:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Versturen gerelateerde opties:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Kopieer gerelateerde opties:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Verwijder gerelateerde opties:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Exporteer gerelateerde opties:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Importeer gerelateerde opties:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Vast zetten gerelateerde opties:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Geschiedenis gerelateerde opties:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Verplaats gerelateerde opties:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Attributen gerelateerde opties:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Attributen"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Verholpen gerelateerde opties:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Verplaats gerelateerde opties:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Terug haal gerelateerde opties:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Status gerelateerde opties:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Vrijgeven gerelateerde opties:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Bijwerken gerelateerde opties:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Onvoldoende argumenten meegegeven"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Gefaald"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Regel"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Versie"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Auteur"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Datum"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Beschuldigen gefaald"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Opschonen is gefaald"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Klaar met opschonen"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Bezig met opschonen ..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Op versie: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Niets te doen"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Voltooid"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Toegevoegd"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Gekopieerd"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Verwijderd"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Hersteld"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Terug gehaald"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Terug halen gefaald"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Overgeslagen"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Bijgewerkt"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Extern"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Aangepast"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Vervangen"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Versturen"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Vast gezet"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Vrijgegeven"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Vast zetten gefaald"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Vrijgeven gefaald"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "Bestaat"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "Vervangen"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Attributen gefaald"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Attributen gefaald"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Attributen gefaald"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Attributen"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Attribuut instellen is gefaald"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Attribuut instellen is gefaald"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Voltooid"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Conflicten"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Extern"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Irrelevant"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Ongewijzigd"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Vermist"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Geblokkeerd"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Gewijzigd"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Samengevoegd"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Conflicten"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normaal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Genegeerd"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incompleet"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Lokaal gekopieerd"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Kopieeren naar"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Lokaal verwijderd"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificaat:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Selecteer een bestand"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Onthouden"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificaat"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Pad"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Alles selecteren/deselecteren"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr ""
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Bericht"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Actie"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Bestand"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Status"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Geschiedenis bericht"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Geschiedenis gefaald"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Gebruikersnaam:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Wachtwoord:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Aanmelden"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Status"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Geschiedenis bericht"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Lokaal verplaatst"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Verplaatsen naar"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificatie"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Naam"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Attribuut instellen is gefaald"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Attributen gefaald"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Waarde"
@@ -892,8 +1260,8 @@ msgstr "Waarde"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "Zelf"
@@ -903,8 +1271,8 @@ msgstr "Zelf"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "Ondliggende bestanden"
@@ -914,152 +1282,87 @@ msgstr "Ondliggende bestanden"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "Recursief"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Attribuut instellen is gefaald"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Attributen gefaald"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_Van"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Selecteer een map"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Naar:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Map:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Verplaatsen gefaald"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Klaar met verplaatsen"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Bezig met verplaatsen ..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_Van"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Naar:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status gefaald"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Ongewijzigde bestanden weergeven"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Onbeheerde bestanden weergeven"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Genegeerde bestanden weergeven"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Externe bestanden verbergen"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Status gefaald"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Certificaat is nog niet geldig."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Certificaat is niet meer geldig."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "Certificaat komt niet overeen met hostnaam."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "Certificaat authoriteit is niet bekend."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Andere fout."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Vertrouwen"
-#: tvp-git-helper/main.c:77
-#, fuzzy
-msgid "Execute branch action"
-msgstr "Beschuldig actie uitvoeren"
-
-#: tvp-git-helper/main.c:83
-#, fuzzy
-msgid "Execute reset action"
-msgstr "Terug haal actie uitvoeren"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Bechuldigen gerelateerde opties:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Terug haal gerelateerde opties:"
+#~ msgid "Execute remove action"
+#~ msgstr "Verplaats actie uitvoeren"
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
#, fuzzy
-msgid "Reset"
-msgstr "Terug Halen"
+#~ msgid "Remove Related Options:"
+#~ msgstr "Verholpen gerelateerde opties:"
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "Klaar met opschonen"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Klaar met opschonen"
diff --git a/po/pl.po b/po/pl.po
index ac6f1f5..06c2a71 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin 0.0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-04-06 11:57+0100\n"
"Last-Translator: Piotr Sokół <piotr.sokol at 10g.pl>\n"
"Language-Team: Polish\n"
@@ -18,303 +18,485 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "Kontrola wersji SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Dodaj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Dodawanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Utwórz lokalną kopię..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Zatwierdź zmiany"
+msgid "Menu|Branch"
+msgstr "Odblokuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
-msgid "Changelist"
-msgstr "Zmieniony"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Utwórz lokalną kopię..."
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Tworzenie lokalnej kopii"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Uporządkuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Porządkowanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Skopiuj..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
#, fuzzy
msgid "Menu|Commit"
msgstr "Wprowadź zmiany..."
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
#, fuzzy
msgid "Commit"
msgstr "Wprowadzanie zmian"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Różnice..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Różnice"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Usuń..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Uporządkuj..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Informacja..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Dziennik..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Dziennik"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Przenieś"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Połączony"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Przenieś"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Przenoszenie"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Usuń..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Stan..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Rozwiąż..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Cofanie zmian"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Cofnij zmiany..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Cofanie zmian"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Rozwiąż..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Rozwiązywanie"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Dziennik..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Stan..."
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Stan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Stan..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Stan"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Dziennik..."
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Akcja „%s” nie została zaimplementowana"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "Kontrola wersji SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Zatwierdź zmiany"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Changelist"
+msgstr "Zmieniony"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Uporządkuj..."
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Porządkowanie"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Skopiuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Kopiowanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Usuń..."
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Usuwanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Różnice..."
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Różnice"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Eksportuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Eksportowanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importowanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Informacja..."
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informacja"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Zablokuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Blokowanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Dziennik..."
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Dziennik"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Przenieś"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Przenoszenie"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Edytuj właściwości..."
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
#, fuzzy
msgid "Edit Properties"
msgstr "Edycja właściwości"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Rozwiąż..."
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Rozwiązywanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
#, fuzzy
msgid "Menu|Revert"
msgstr "Cofnij zmiany..."
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
#, fuzzy
msgid "Revert"
msgstr "Cofanie zmian"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Stan..."
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Stan"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Odblokuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Odblokowywanie"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Zaktualizuj..."
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Aktualizacja"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Akcja „%s” nie została zaimplementowana"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Nieznany"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Wersja:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repozytorium:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Numer poprawki:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Ostatnio zmodyfikowany:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "Lista zmian:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
#, fuzzy
msgid "Empty"
msgstr "Pusty"
@@ -322,7 +504,7 @@ msgstr "Pusty"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "Pliki"
@@ -335,573 +517,761 @@ msgstr "Pliki"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr ""
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr ""
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr ""
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:103
+msgid "Execute clean action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:109
+msgid "Execute clone action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:133
+msgid "Execute stash action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+msgid "Clone Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:183
+msgid "Stash Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Wersja"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Data"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Ścieżka"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Pliki ignorowane"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Pliki ignorowane"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Pliki ignorowane"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Zakończono porządkowanie"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Porządkowanie..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+#, fuzzy
+msgid "Failed"
+msgstr "Niepowodzenie"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+#, fuzzy
+msgid "Select/Unselect all"
+msgstr "Zaznaczenie/odznaczenie wszyskich"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Wprowadzanie zmian"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Komentarz"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Zmieniony"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Plik"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Zakończono porządkowanie"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Przenoszenie"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Akcja"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Zakończono porządkowanie"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Cofanie zmian"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repozytorium:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Wybór katalogu"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Katalog:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr ""
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr ""
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr ""
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr ""
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr ""
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr ""
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr ""
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr ""
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr ""
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr ""
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr ""
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr ""
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr ""
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr ""
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr ""
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr ""
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr ""
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr ""
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Właściwości"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
#, fuzzy
msgid "Not enough arguments provided"
msgstr "Nie podano wystarczającej ilości argumentów"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-#, fuzzy
-msgid "Failed"
-msgstr "Niepowodzenie"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Wersja"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Data"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Nie udało się uporządkować"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Zakończono porządkowanie"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Porządkowanie..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "na poprawce: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
#, fuzzy
msgid "Nothing to do"
msgstr "Brak zadań do wykonania"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Ukończono"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Dodany"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Skopiowany"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Usunięty"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
#, fuzzy
msgid "Skipped"
msgstr "Pominięty"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Zaktualizowany"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Zmodyfikowany"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Zablokowany"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Odblokowany"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Nie udało się zablokować"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Nie udało się odblokować"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
#, fuzzy
msgid "Changelist moved"
msgstr "Zmieniony"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Właściwości"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Właściwości"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Właściwości"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Właściwości"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Ukończono"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "W konflikcie"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Nie udało się odblokować"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Niezmieniony"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Zmieniony"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
#, fuzzy
msgid "Merged"
msgstr "Połączony"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
#, fuzzy
msgid "Conflicted"
msgstr "W konflikcie"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Zignorowany"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Niekompletny"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
#, fuzzy
msgid "Local copy"
msgstr "Lokalna kopia"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Usuń komentarz"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certyfikat:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr ""
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Ścieżka"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-#, fuzzy
-msgid "Select/Unselect all"
-msgstr "Zaznaczenie/odznaczenie wszyskich"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr ""
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Komentarz"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Akcja"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Plik"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Stan"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Nie udało się zalogować"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "Nazwa _użytkownika:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Hasło:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Stan"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Typ MIME"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
#, fuzzy
msgid "Notification"
msgstr "Powiadomienie"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nazwa"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Wartość"
@@ -911,8 +1281,8 @@ msgstr "Wartość"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -922,8 +1292,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr ""
@@ -933,155 +1303,86 @@ msgstr ""
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
msgstr "Rekursywnie"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Wybór katalogu"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Katalog:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
-msgid "Relocate failed"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate.c:86
-msgid "Relocate finished"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate.c:128
-msgid "Relocating ..."
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Pliki niezmodyfikowane"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
#, fuzzy
msgid "Show Unversioned Files"
msgstr "Pliki bez wersji"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Pliki ignorowane"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repozytorium:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Certyfikat nie jest poprawny."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Certyfikat wygasł."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
#, fuzzy
msgid "Certificate does not match the remote hostname."
msgstr "Certyfikat nie pasuje do nazwy głównego komputera."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
#, fuzzy
msgid "Certificate authority is unknown."
msgstr "Upoważnienia certyfikatu są nieznane."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr ""
-#: tvp-git-helper/main.c:77
-msgid "Execute branch action"
-msgstr ""
-
-#: tvp-git-helper/main.c:83
-msgid "Execute reset action"
-msgstr ""
-
-#: tvp-git-helper/main.c:102
-msgid "Branch Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-msgid "Reset Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Cofanie zmian"
-
-#: tvp-git-helper/tgh-add.c:58
#, fuzzy
-msgid "Add finished"
-msgstr "Zakończono porządkowanie"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Zakończono porządkowanie"
#~ msgid "Desktop"
#~ msgstr "Pulpit"
diff --git a/po/pt.po b/po/pt.po
index 84f473a..3971909 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2008-11-01 11:37+0100\n"
"Last-Translator: Nuno Miguel <nunis at netcabo.pt>\n"
"Language-Team: \n"
@@ -16,306 +16,488 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Adicionar"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Adicionar"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Falha"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Falha"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Falha"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Checkout"
+msgid "Menu|Branch"
+msgstr "Falha"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
-msgid "Changelist"
-msgstr "Modificado"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Limpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Limpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copiar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Commit"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Enviar"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diferença"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Alternar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Limpar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Info"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Menu"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Juntado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Menu"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Falha"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Reverter"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Reverter"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Reverter"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Estado"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Estado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Acção %s não implementada"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Checkout"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Changelist"
+msgstr "Modificado"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Limpar"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Limpar"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Apagar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Apagar"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diferença"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informações"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Travar"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Travar"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Menu"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Editar Propriedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Editar Propriedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Realocar"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Realocar"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resolvido"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Reverter"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Reverter"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Estado"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Alternar"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Alternar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Destravar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Destravar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Actualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Actualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Acção %s não implementada"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Desconhecido"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revisão:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repositório:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Revisão Modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Data de modificação:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
#, fuzzy
msgid "Changelist:"
msgstr "Modificado"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
#, fuzzy
msgid "Files"
msgstr "Ficheiro"
@@ -329,569 +511,766 @@ msgstr "Ficheiro"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Imprimir informação da versão"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Executar acção add"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Executar acção de culpa"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Executar acção de culpa"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Executar acção cleanup"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Executar acção de log"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Executar acção de log"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Executar acção mover"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Executar acção de reversão"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Executar acção de actualização"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Executar acção de actualização"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Adicionar Opções Relacionadas:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Opções de culpa"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Opções de culpa"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Opções Relacionadas de Cópia:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Opções de Registo:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Opções de Mudança:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Opções de Reversão:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Opções de Estado:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Opções de Estado:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Linha"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revisão"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Data"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Caminho"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Mostrar Ficheiros Ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Mostrar Ficheiros Ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Mostrar Ficheiros Ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Limpeza concluída"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Limpando..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Falhou"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Seleccionar/De-seleccionar tudo"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Enviar"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Mensagem"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Modificado"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Ficheiro"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Limpeza concluída"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Mover Para"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Mover"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Acção"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Re-alocação concluída"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Reverter"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nome"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repositório:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Seleccione uma pasta"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Directório:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Transferir"
+
+#: ../tvp-svn-helper/main.c:124
#, fuzzy
msgid "Execute changelist action"
msgstr "Executar acção de checkout"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Executar acção de checkout"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Executar acção cleanup"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Executar acção commit"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Executar acção copiar"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Executar acção apagar"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Executar acção export"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Executar acção import"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Executar acção de lock"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Executar acção de log"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Executar acção mover"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Executar acção de propriedades"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Executar acção resolved"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Executar acção de re-alocação"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Executar acção de reversão"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Executar acção de actualização"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Executar acção commit"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Executar acção de checkout"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Executar acção de actualização"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Adicionar Opções Relacionadas:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Opções de culpa"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
#, fuzzy
msgid "Changelist Related Options:"
msgstr "Opções Checkout Relacionadas:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Opções Checkout Relacionadas:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Opções Limpeza Relacionadas:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Opções de Envio:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Opções Relacionadas de Cópia:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Opções de Exclusão:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Opções de Exportação:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Opções de Importação:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Opções de Travamento:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Opções de Registo:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Opções de Mudança:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Opções de Propriedades Relacionadas"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Propriedades"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Opções de Resolução"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Opções Re-alocação Relacionadas:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Opções de Reversão:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Opções de Estado:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Opções Mudança Relacionadas:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Opções de Destravar:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Opções de Actualização:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Argumentos insuficientes fornecidos"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Falhou"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Linha"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revisão"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Data"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Culpa falhou"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Limpeza falhou"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Limpeza concluída"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Limpando..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Na revisão: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Nada para fazer"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Completado"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Enviar Mensagem"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Adicionado"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Copiado"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Apagado"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Restaurado"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Revertido"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Reversão falhou"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Ignorado"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Actualizado"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Externo"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Substituído"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "A transmitir"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Prender"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Destravar"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Falha ao travar"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Destravar falhou"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
#, fuzzy
msgid "Changelist moved"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
#, fuzzy
msgid "Replace"
msgstr "Substituído"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Propriedades falhou"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Propriedades falhou"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Propriedades falhou"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Propriedades"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Mudança de propriedade falhou"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Mudança de propriedade falhou"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Completado"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Conflituoso"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Externo"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Inaplicável"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Não modificada"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Em Falta"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Obstruído"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Juntado"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Conflituoso"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignorado"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incompleto"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Cópia local"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Copiar Para"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Apagar local"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Apagar Mensagem"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificado:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Seleccione um ficheiro"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Lembrar"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificado"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Caminho"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Seleccionar/De-seleccionar tudo"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Importar Mensagem"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Mensagem"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Acção"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Ficheiro"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Estado"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Mensagem de Log"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "O Registo Falhou"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "Nome do _utilizador:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Senha:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Login"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Estado"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Mensagem de Log"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Mover local"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Mover Para"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipo mime"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificação"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nome"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Mudança de propriedade falhou"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Propriedades falhou"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Valor"
@@ -901,8 +1280,8 @@ msgstr "Valor"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -912,8 +1291,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
#, fuzzy
msgid "Immediate files"
msgstr "Re-alocação falhou"
@@ -924,156 +1303,91 @@ msgstr "Re-alocação falhou"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
msgstr "Mostrar Recursivo"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Mudança de propriedade falhou"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Propriedades falhou"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_De:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Seleccione uma pasta"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Para:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Directório:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Re-alocação falhou"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Re-alocação concluída"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Re-alocando..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_De:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Para:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Estado falhou"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Mostra Ficheiros Inalterados"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Mostrar Ficheiros sem Versão"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Mostrar Ficheiros Ignorados"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Ocultar Externos"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Verificar Repositório"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Estado falhou"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repositório:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Transferir"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "Certificado ainda não é válido."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "Certificado expirou"
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "O certificado não corresponde ao nome do host remoto."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "A autoridade de certificação é inválida."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "Outra falha."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Confiar"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "Executar acção de culpa"
+#~ msgid "Execute remove action"
+#~ msgstr "Executar acção mover"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "Executar acção de reversão"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Opções de culpa"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "Opções de Resolução"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Opções de Reversão:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Reverter"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Limpeza concluída"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Limpeza concluída"
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s em %2$s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bc9e6e3..4f32f79 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2008-06-13 02:01+0200\n"
"Last-Translator: Og Maciel <ogmaciel at gnome.org>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -17,306 +17,488 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Adicionar"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Adicionar"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Culpa"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Culpa"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Culpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Obter"
+msgid "Menu|Branch"
+msgstr "Culpa"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-#, fuzzy
-msgid "Changelist"
-msgstr "Modificado"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Obter"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Obter"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Limpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Limpar"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copiar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Enviar"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Enviar"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diferença"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diferença"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Alternar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Limpar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Informação"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Registrar"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Combinado"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Mover"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Culpa"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Reverter"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Reverter"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Reverter"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolver"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Registro"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "Ação %s não está implementada"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Obter"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Changelist"
+msgstr "Modificado"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Limpar"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Limpar"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copiar"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Excluir"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Excluir"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diferença"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diferença"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importar"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Informação"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Informação"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Travar"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Travar"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Registro"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Registrar"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Mover"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Editar propriedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Editar propriedades"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Realocar"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Realocar"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Resolvido"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resolvido"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolver"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Reverter"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Reverter"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Alternar"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Alternar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Destravar"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Destravar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Atualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Atualizar"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "Ação %s não está implementada"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Desconhecido"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revisão:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Repositório:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "Revisão modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Data modificada:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Autor:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
#, fuzzy
msgid "Changelist:"
msgstr "Modificado"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
#, fuzzy
msgid "Files"
msgstr "Arquivo"
@@ -330,569 +512,766 @@ msgstr "Arquivo"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Imprimir informação da versão"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "Executar ação de adição"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "Executar ação de culpa"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "Executar ação de culpa"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "Executar ação de limpeza"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "Executar ação de registro"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "Executar ação de registro"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "Executar ação de mudança"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "Executar ação de reversão"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "Executar ação de status"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "Executar ação de status"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Opções de adição:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Opções de culpa:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Opções de culpa:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Opções de cópia:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Opções de registro:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Opções de mudança:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Opções de reversão:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Opções de status:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Opções de status:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Linha"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revisão"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Data"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Caminho"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Mostrar arquivos ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Mostrar arquivos ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Mostrar arquivos ignorados"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Limpeza concluída"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "Limpando..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "Falhou"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "Selecionar/Deselecionar tudo"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Autor"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Enviar"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Mensagem"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Modificado"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Arquivo"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Limpeza concluída"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Mover para"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Mover"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Ação"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Realocação concluída"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Reverter"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Nome"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Repositório:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Selecionar uma pasta"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Diretório:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Trasferir"
+
+#: ../tvp-svn-helper/main.c:124
#, fuzzy
msgid "Execute changelist action"
msgstr "Executar ação de obtenção"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "Executar ação de obtenção"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "Executar ação de limpeza"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "Executar ação de envio"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "Executar ação de cópia"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "Executar ação de exclusão"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "Executar ação de exportação"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "Executar ação de importação"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "Executar ação de travamento"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "Executar ação de registro"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "Executar ação de mudança"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "Executar ação de propriedades"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "Executar ação de resolução"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "Executar ação de realocação"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "Executar ação de reversão"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "Executar ação de status"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "Executar ação de alternação"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "Executar ação de destravamento"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "Executar ação de atualização"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Opções de adição:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Opções de culpa:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
#, fuzzy
msgid "Changelist Related Options:"
msgstr "Opções de obtenção:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Opções de obtenção:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Opções de limpeza:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Opções de envio:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Opções de cópia:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Opções de exclusão:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Opções de exportação:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Opções de importação:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Opções de travamento:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Opções de registro:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Opções de mudança:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Opções de propriedades:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Propriedades"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Opções de resolução:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Opções de realocação:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Opções de reversão:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Opções de status:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Opções relacionadas à alternação:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Opções de destravamento:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Opções de atualização:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "Insuficiente argumentos providenciados"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "Falhou"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Linha"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revisão"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Autor"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Data"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Falha de culpa"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Falha de limpeza"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Limpeza concluída"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "Limpando..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "Na revisão: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "Nada a fazer"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "Concluído"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Mensagem de envio"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "Adicionado"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "Copiado"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "Excluído"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "Restaurado"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "Revertido"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Falha de reversão"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "Pulado"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "Atualizado"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "Externo"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "Substituído"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "Transmitindo"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "Travado"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "Destravado"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Falha ao travar"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Falha ao destravar"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
#, fuzzy
msgid "Changelist moved"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
#, fuzzy
msgid "Replace"
msgstr "Substituído"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Falha de propriedades"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Falha de propriedades"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Falha de propriedades"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Propriedades"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "Falha na definição da propriedade"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "Falha na definição da propriedade"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "Concluído"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "Em conflito"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "Externo"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "Não pode ser aplicado"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "Sem modificação"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "Faltando"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "Obstruído"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "Modificado"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "Combinado"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "Em conflito"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "Ignorado"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "Incompleto"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Cópia local"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Copiar para"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "Exclusão local"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "Mensagem de exclusão"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certificado:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Selecionar um arquivo"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Lembrar"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certificado"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Caminho"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "Selecionar/Deselecionar tudo"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Mensagem de importação"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Mensagem"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Ação"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Arquivo"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Estado"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Mensagem de registro"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Falha de registro"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "Nome do _usuário:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Senha:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "Login"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Estado"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Mensagem de registro"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "Mudança local"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Mover para"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipo mime"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificação"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Nome"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "Falha na definição da propriedade"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Falha de propriedades"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Valor"
@@ -902,8 +1281,8 @@ msgstr "Valor"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -913,8 +1292,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
#, fuzzy
msgid "Immediate files"
msgstr "Falha de realocação"
@@ -925,156 +1304,91 @@ msgstr "Falha de realocação"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
msgstr "Mostrar recursivamente"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "Falha na definição da propriedade"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Falha de propriedades"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_De:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Selecionar uma pasta"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_Para:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Diretório:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Falha de realocação"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Realocação concluída"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "Realocando..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_De:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_Para:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Falha de status"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "Mostrar arquivos sem modificação"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "Mostrar arquivos sem controle"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Mostrar arquivos ignorados"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "Ocultar externos"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "Checar repositório"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Falha de status"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Repositório:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Trasferir"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "O certificado ainda não é válido."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "O certificado expirou."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "O certificado não confere com o nome do hóspede remoto."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "A autoridade do certificado é desconhecido."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "outra falha."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "Confiança"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "Executar ação de culpa"
+#~ msgid "Execute remove action"
+#~ msgstr "Executar ação de mudança"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "Executar ação de reversão"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Opções de culpa:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "Opções de resolução:"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Opções de reversão:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Reverter"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Limpeza concluída"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Limpeza concluída"
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s em %2$s"
diff --git a/po/sv.po b/po/sv.po
index ff32cc4..ec81f98 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-01-05 11:51+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -15,304 +15,483 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Lägg till"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Lägg till"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Verkställ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
#, fuzzy
-msgid "Menu|Changelist"
-msgstr "Verkställ"
+msgid "Menu|Branch"
+msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Checka ut"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
+msgstr "Kopiera"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+msgid "Clean"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Kopiera"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Verkställ"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Verkställ"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Ta bort"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Kopiera"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Info"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Logg"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Logg"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Flytta"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "Meddelande"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Flytta"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Flytta"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Ta bort"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Ta bort"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+msgid "Rebase"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Ta bort"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Flytta"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Flytta"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Logg"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Logg"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr ""
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+#, fuzzy
+msgid "Menu|Changelist"
+msgstr "Verkställ"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Kopiera"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Kopiera"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Ta bort"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Ta bort"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Exportera"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Exportera"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Importera"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Importera"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Lås"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Lås"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Logg"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Logg"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Flytta"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Flytta"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Redigera egenskaper"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Redigera egenskaper"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Uppdatera"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Uppdatera"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "Okänt"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "Revision:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "Förråd:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "Ändringsdatum:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "Upphovsman:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr ""
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
#, fuzzy
msgid "Files"
msgstr "Fil"
@@ -326,560 +505,743 @@ msgstr "Fil"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "Skriv ut versionsinformation"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr ""
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr ""
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:103
+msgid "Execute clean action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:109
+msgid "Execute clone action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:133
+msgid "Execute stash action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+msgid "Clone Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:183
+msgid "Stash Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "Rad"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "Revision"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "Upphovsman"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "Datum"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "Sökväg"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "Visa ignorerade filer"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "Visa ignorerade filer"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "Visa ignorerade filer"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+msgid "Clone finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:123
+msgid "Cloning ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "Upphovsman"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Verkställ"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "Meddelande"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "Verkställ"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "Fil"
+
+#: ../tvp-git-helper/tgh-move.c:58
+msgid "Move finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "Flytta till"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Flytta"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "Åtgärd"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+msgid "Reset finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:143
+msgid "Reset ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "Namn"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_Förråd:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "Välj en mapp"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_Katalog:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "Överföring"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr ""
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr ""
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr ""
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr ""
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr ""
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr ""
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr ""
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr ""
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr ""
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr ""
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr ""
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr ""
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr ""
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr ""
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr ""
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr ""
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr ""
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "Egenskaper"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr ""
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "Rad"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "Revision"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "Upphovsman"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "Datum"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "Egenskaper"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "Egenskaper"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "Egenskaper"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "Egenskaper"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr ""
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "Normal"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "Lokal kopia"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "Kopiera till"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_Certifikat:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "Välj en fil"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "Kom ihåg"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "Certifikat"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "Sökväg"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr ""
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "Meddelande"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "Åtgärd"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "Fil"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "Tillstånd"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_Användarnamn:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_Lösenord:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "Tillstånd"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "Flytta till"
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
+msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime-typ"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "Namn"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "Värde"
@@ -889,8 +1251,8 @@ msgstr "Värde"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -900,8 +1262,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr ""
@@ -911,151 +1273,80 @@ msgstr ""
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
#, fuzzy
msgid "Recursive"
msgstr "Visa rekursivt"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
msgstr ""
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
msgid "_From:"
msgstr "_Från:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "Välj en mapp"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr "_Till:"
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_Katalog:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
-msgid "Relocate failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:86
-msgid "Relocate finished"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:128
-msgid "Relocating ..."
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "Visa ignorerade filer"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_Förråd:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "Överföring"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr ""
-#: tvp-git-helper/main.c:77
-msgid "Execute branch action"
-msgstr ""
-
-#: tvp-git-helper/main.c:83
-msgid "Execute reset action"
-msgstr ""
-
-#: tvp-git-helper/main.c:102
-msgid "Branch Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-msgid "Reset Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-msgid "Reset"
-msgstr ""
-
-#: tvp-git-helper/tgh-add.c:58
-msgid "Add finished"
-msgstr ""
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
-
#~ msgid "%1$s on %2$s"
#~ msgstr "%1$s på %2$s"
diff --git a/po/thunar-vcs-plugin.pot b/po/thunar-vcs-plugin.pot
index c9b7147..06f3af1 100644
--- a/po/thunar-vcs-plugin.pot
+++ b/po/thunar-vcs-plugin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,303 +16,463 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
+msgid "Menu|Add"
msgstr ""
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
+msgid "Add"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298
-msgid "Menu|Add"
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Menu|Bisect"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
-msgid "Add"
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+msgid "Menu|Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+msgid "Menu|Clean"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+msgid "Clean"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+msgid "Menu|Clone"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:335
-msgid "Menu|Copy"
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
-msgid "Copy"
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:340
-msgid "Menu|Delete"
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Menu|Fetch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
-msgid "Delete"
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Menu|Grep"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:350
-msgid "Menu|Export"
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Menu|Init"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
-msgid "Export"
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+msgid "Init"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:355
-msgid "Menu|Import"
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
-msgid "Import"
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:360
-msgid "Menu|Info"
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+msgid "Menu|Merge"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:360
-msgid "Info"
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+msgid "Merge"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:370
-msgid "Menu|Lock"
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
-msgid "Lock"
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Menu|Pull"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Menu|Push"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+msgid "Menu|Rebase"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+msgid "Rebase"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+msgid "Menu|Reset"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+msgid "Reset"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+msgid "Menu|Remove"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+msgid "Remove"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Menu|Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+msgid "Menu|Stash"
+msgstr ""
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+msgid "Stash"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Menu|Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr ""
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr ""
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
+msgid "Menu|Copy"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
+msgid "Copy"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
+msgid "Menu|Delete"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
+msgid "Delete"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
+msgid "Menu|Export"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
+msgid "Export"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
+msgid "Menu|Import"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
+msgid "Import"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
+msgid "Menu|Info"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
+msgid "Info"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
+msgid "Menu|Lock"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
+msgid "Lock"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr ""
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr ""
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr ""
@@ -325,556 +485,732 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr ""
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr ""
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr ""
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr ""
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr ""
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+msgid "Execute branch action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:103
+msgid "Execute clean action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:109
+msgid "Execute clone action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:127
+msgid "Execute reset action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:133
+msgid "Execute stash action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:159
+msgid "Branch Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+msgid "Clone Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:179
+msgid "Reset Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:183
+msgid "Stash Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+msgid "Excldue ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+msgid "Include ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+msgid "Only ignored files"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+msgid "Clone finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:123
+msgid "Cloning ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+msgid "AuthorDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+msgid "CommitDate"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+msgid "Changes"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:58
+msgid "Move finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-move.c:151
+msgid "Move ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+msgid "Reset finished"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:143
+msgid "Reset ..."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr ""
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr ""
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr ""
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr ""
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr ""
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr ""
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr ""
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr ""
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr ""
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr ""
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr ""
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr ""
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr ""
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr ""
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr ""
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr ""
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr ""
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr ""
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr ""
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr ""
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr ""
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr ""
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr ""
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr ""
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr ""
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr ""
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr ""
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr ""
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr ""
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr ""
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr ""
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr ""
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr ""
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr ""
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr ""
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr ""
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:94
-msgid "Local move"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
msgstr ""
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-move.c:94
+msgid "Local move"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr ""
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
msgstr ""
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr ""
+
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr ""
@@ -884,8 +1220,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr ""
@@ -895,8 +1231,8 @@ msgstr ""
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr ""
@@ -906,146 +1242,75 @@ msgstr ""
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr ""
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
+#: ../tvp-svn-helper/tsh-relocate.c:71
+msgid "Relocate failed"
msgstr ""
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
+#: ../tvp-svn-helper/tsh-relocate.c:86
+msgid "Relocate finished"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
+#: ../tvp-svn-helper/tsh-relocate.c:128
+msgid "Relocating ..."
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
msgid "_To:"
msgstr ""
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:71
-msgid "Relocate failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:86
-msgid "Relocate finished"
-msgstr ""
-
-#: tvp-svn-helper/tsh-relocate.c:128
-msgid "Relocating ..."
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr ""
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr ""
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr ""
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr ""
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr ""
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr ""
-
-#: tvp-git-helper/main.c:77
-msgid "Execute branch action"
-msgstr ""
-
-#: tvp-git-helper/main.c:83
-msgid "Execute reset action"
-msgstr ""
-
-#: tvp-git-helper/main.c:102
-msgid "Branch Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
-
-#: tvp-git-helper/main.c:106
-msgid "Reset Related Options:"
-msgstr ""
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-msgid "Reset"
-msgstr ""
-
-#: tvp-git-helper/tgh-add.c:58
-msgid "Add finished"
-msgstr ""
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 5983fd9..cd7cf6e 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-05-14 02:39+0500\n"
"Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,303 +19,486 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "مینیو|شامل کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "شامل کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "مینیو|بلیم"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "مینیو|بلیم"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "مینیو|تبدیلی کی فہرست"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "مینیو|بلیم"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "تبدیلی کی فہرست"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "مینیو|چیک کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "چیک کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "مینیو|صاف کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "صاف کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "مینیو|کاپی"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "مینیو|کمٹ"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "تبصرہ"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "مینیو|فرق"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "فرق"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "مینیو|تبدیل"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "مینیو|صاف کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "مینیو|معلومات"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "مطلق"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "مینیو|لاگ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "مینیو|منتقل کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "مرج شدہ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "مینیو|منتقل کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "منتقل کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "مینیو|بلیم"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "مینیو|حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "مینیو|ریزولو"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "واپس"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "مینیو|واپس"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "واپس"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "مینیو|ریزولو"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "مینیو|لاگ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "مینیو|حالت"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "مینیو|حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "مینیو|لاگ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "عمل %s لاگو نہیں کیا گیا ہے"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "مینیو|تبدیلی کی فہرست"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "تبدیلی کی فہرست"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "مینیو|صاف کریں"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "صاف کریں"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "مینیو|کاپی"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "کاپی"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "مینیو|حذف"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "حذف"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "مینیو|فرق"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "فرق"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "مینیو|برآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "برآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "مینیو|درآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "درآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "مینیو|معلومات"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "معلومات"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "مینیو|قفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "قفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "مینیو|لاگ"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "مینیو|منتقل کریں"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "منتقل کریں"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "مینیو|خصوصیات مدون کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "خصوصیات مدون کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "مینیو|پھر تلاش کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "پھر تلاش کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "مینیو|ریزوولڈ"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "ریزوولڈ"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "مینیو|ریزولو"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolve"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "مینیو|واپس"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "واپس"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "مینیو|حالت"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "حالت"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "مینیو|تبدیل"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "تبدیل"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "مینیو|غیر مقفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "غیر مقفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "مینیو|تجدید"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "تجدید"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "عمل %s لاگو نہیں کیا گیا ہے"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "ربط:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "نامعلوم"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "ریویزن:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "ریپازٹری:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "تبدیلی ریویزن:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "تبدیلی کی تاریخ:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "مصنف:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "تبدیلی کی فہرست:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "گہرائی:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "استثناء"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "خالی"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "فائلیں"
@@ -328,565 +511,762 @@ msgstr "فائلیں"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "فوراً"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "مطلق"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "ورژن معلومات طبع کریں"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "شامل کرنے کی حرکت چلائیں"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "بلیم حرکت چلائیں"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "بلیم حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "صفائی حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "لاگ حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "لاگ حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "منتقلی کی حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "ریورٹ حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "حالت حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "حالت حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "متعلقہ اختیارات شامل کریں:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "بلیم متعلقہ اختیارات:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "بلیم متعلقہ اختیارات:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "متعلقہ اختیارات کاپی کریں:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "متعلقہ اختیارات کا لاگ:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "متعلقہ اختیارات منتقل کریں:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "متعلقہ اختیارات منعکس کریں:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "متعلقہ اختیارات کی حالت:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "متعلقہ اختیارات کی حالت:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "لائن"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "ریویزن"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "مصنف"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "تاریخ"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "پاتھ"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "نظر انداز کردہ فائلیں دکھائیں"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "نظر انداز کردہ فائلیں دکھائیں"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "نظر انداز کردہ فائلیں دکھائیں"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "صاف کرنا مکمل ہوا"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "صاف کیا جارہا ہے..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "ناکام"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "منتتخب/نامنتخب تمام"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "مصنف"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "تبصرہ"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "پیغام"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "تبدیل شدہ"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "فائل"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "صاف کرنا مکمل ہوا"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "منتقل تا"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "منتقل کریں"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "حرکت"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "ری لوکیٹ مکمل شدہ"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "واپس"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "نام"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_ریپازٹری:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "فولدر منتخب کریں"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_ڈائریکٹری:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "ٹرانسفر"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "تبدیلی کی فہرست حرکت چلائیں"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "چیک کریں"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "صفائی حرکت چلائیں"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "کمٹ حرکت چلائیں"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "کاپی حرکت چلائیں"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "حذف حرکت چلائیں"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "برآمد حرکت چلائیں"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "درآمد حرکت چلائیں"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "مقفل حرکت چلائیں"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "لاگ حرکت چلائیں"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "منتقلی کی حرکت چلائیں"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "خصوصیات حرکت چلائیں"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "ریزولوڈ حرکت چلائیں"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "ری لوکیٹ حرکت چلائیں"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "ریورٹ حرکت چلائیں"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "حالت حرکت چلائیں"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "تبدیلی حرکت چلائیں"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "غیر مقفل حرکت چلائیں"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "تجدید کریں"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "متعلقہ اختیارات شامل کریں:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "بلیم متعلقہ اختیارات:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "متعلقہ اختیارات کی تبدیلی فہرست:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "متعلقہ اختیارات چیک کریں:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "متعلقہ اختیارات صاف کریں:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "متعلقہ اختیارات کو کمٹ کریں:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "متعلقہ اختیارات کاپی کریں:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "متعلقہ اختیارات حذف کریں:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "متعلقہ اختیارات برآمد کریں:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "متعلقہ اختیارات درآمد کریں:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "متعلقہ اختیارات مقفل کریں:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "متعلقہ اختیارات کا لاگ:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "متعلقہ اختیارات منتقل کریں:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "متعلقہ اختیارات کی خصوصیات:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "خصوصیات"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "حل شدہ متعلقہ اختیارات:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "متعلقہ اختیارات دوبارہ تلاش کریں:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "متعلقہ اختیارات منعکس کریں:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "متعلقہ اختیارات کی حالت:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "متعلقہ اختیارات بدلیں:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "متعلقہ اختیارات غیر مقفل کریں:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "متعلقہ اختیارات اپڈیٹ کریں:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "کافی بحث دستیاب نہیں کی گئی"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "ناکام"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "لائن"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "ریویزن"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "مصنف"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "تاریخ"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "بلیم ناکام"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "صاف کرنا ناکام"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "صاف کرنا مکمل ہوا"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "صاف کیا جارہا ہے..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "ریویزن پر: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "کرنے کے لیے کچھ نہیں"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "مکمل"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "پیغام کمٹ کریں"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "شامل کردہ"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "کاپی شدہ"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "حذف شدہ"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "بحال شدہ"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "ریورٹ شدہ"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "ریورٹ ناکام"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "نظر انداز شدہ"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "تجدید شدہ"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "خارجی"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "تبدیل شدہ"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "اوپر لکھا گیا"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "ارسال"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "مقفل"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "غیر مقفل"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "قفل ناکام"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "غیر مقفلی ناکام"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "موجود"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "تبدیلی کی فہرست سیٹ"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "تبدیلی کی فہرست صاف کردی گئی"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "تبدیلی کی فہرست منتقل کردی گئی"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "مرج شروع کردیا گیا"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "خارجی مرج شروع کردیا گیا"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "اوپر لکھیں"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "خصوصیات"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "خصوصیت مرتب کرنے میں غلطی"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "خصوصیت مرتب کرنے میں غلطی"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "مکمل"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "متضارب"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "خارجی"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "نا موزوں"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "غیر تبدیل شدہ"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "مفقود"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "ابسٹریکٹڈ"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "تبدیل شدہ"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "مرج شدہ"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "متضارب"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "سادہ"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "نظر انداز شدہ"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "نا مکمل"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "لوکل کاپی"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "کاپی تا"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "لوکل حذف"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "پیغام حذف کریں"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_سرٹیفیکیٹ:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "فائل منتخب کریں"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "یاد رکھیں"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "سرٹیفیکیٹ"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "پاتھ"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "منتتخب/نامنتخب تمام"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "پیغام درآمد کریں"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "پیغام"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "حرکت"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "فائل"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "حالت"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "لاگ پیغام"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "لاگ ناکام"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_صارف نام:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_پاس ورڈ:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "لاگ ان"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "حالت"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "لاگ پیغام"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "لوکل منتقلی"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "منتقل تا"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime نوعیت"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "اطلاعیہ"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "نام"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "خصوصیت مرتب کرنے میں غلطی"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "قدر"
@@ -896,8 +1276,8 @@ msgstr "قدر"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "ذاتی"
@@ -907,8 +1287,8 @@ msgstr "ذاتی"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "فوری فائلیں"
@@ -918,155 +1298,90 @@ msgstr "فوری فائلیں"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "تکراری"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "خصوصیت مرتب کرنے میں غلطی"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "خصوصیات ناکام"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_از:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "فولدر منتخب کریں"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_تا:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_ڈائریکٹری:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "ری لوکیٹ ناکام"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "ری لوکیٹ مکمل شدہ"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "ری لوکیٹ کیا جارہا ہے..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_از:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_تا:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "حالت ناکام"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "غیر تبدیل شدہ فائلیں دکھائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "غیر ورژن شدہ فائلیں دکھائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "نظر انداز کردہ فائلیں دکھائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "خارجی چھپائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "ریپازٹری چیک کریں"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "حالت ناکام"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_ریپازٹری:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "ٹرانسفر"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "سرٹیفیکیٹ ابھی کارآمد نہیں."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "سرٹیفیکیٹ ایکسپائر ہے."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "سرٹیفیکیٹ ریموٹ ہوسٹ نیم سے مطابقت نہیں رکھتا."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "سرٹیفیکیٹ اتھارٹی نا معلوم ہے."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "دیگر ناکامی."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "اعتماد"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "بلیم حرکت چلائیں"
+#~ msgid "Execute remove action"
+#~ msgstr "منتقلی کی حرکت چلائیں"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "ریورٹ حرکت چلائیں"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "بلیم متعلقہ اختیارات:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "حل شدہ متعلقہ اختیارات:"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "متعلقہ اختیارات منعکس کریں:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "واپس"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "صاف کرنا مکمل ہوا"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "صاف کرنا مکمل ہوا"
#~ msgid "SVN _Checkout"
#~ msgstr "SVN _چیک آؤٹ"
diff --git a/po/ur_PK.po b/po/ur_PK.po
index 5983fd9..cd7cf6e 100644
--- a/po/ur_PK.po
+++ b/po/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-05-14 02:39+0500\n"
"Last-Translator: Muhammad Ali Makki <makki.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -19,303 +19,486 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "مینیو|شامل کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "شامل کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "مینیو|بلیم"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "مینیو|بلیم"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "مینیو|تبدیلی کی فہرست"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "مینیو|بلیم"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "تبدیلی کی فہرست"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "مینیو|چیک کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "چیک کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "مینیو|صاف کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "صاف کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "مینیو|کاپی"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "مینیو|کمٹ"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "تبصرہ"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "مینیو|فرق"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "فرق"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "مینیو|تبدیل"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "مینیو|صاف کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "مینیو|معلومات"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "مطلق"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "مینیو|لاگ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "مینیو|منتقل کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "مرج شدہ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "مینیو|منتقل کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "منتقل کریں"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "مینیو|بلیم"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "مینیو|حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "مینیو|ریزولو"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "واپس"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "مینیو|واپس"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "واپس"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "مینیو|ریزولو"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "مینیو|لاگ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "مینیو|حالت"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "مینیو|حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "حالت"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "مینیو|لاگ"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "عمل %s لاگو نہیں کیا گیا ہے"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "مینیو|تبدیلی کی فہرست"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "تبدیلی کی فہرست"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "مینیو|صاف کریں"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "صاف کریں"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "مینیو|کاپی"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "کاپی"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "مینیو|حذف"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "حذف"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "مینیو|فرق"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "فرق"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "مینیو|برآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "برآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "مینیو|درآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "درآمد"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "مینیو|معلومات"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "معلومات"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "مینیو|قفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "قفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "مینیو|لاگ"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "مینیو|منتقل کریں"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "منتقل کریں"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "مینیو|خصوصیات مدون کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "خصوصیات مدون کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "مینیو|پھر تلاش کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "پھر تلاش کریں"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "مینیو|ریزوولڈ"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "ریزوولڈ"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "مینیو|ریزولو"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolve"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "مینیو|واپس"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "واپس"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "مینیو|حالت"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "حالت"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "مینیو|تبدیل"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "تبدیل"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "مینیو|غیر مقفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "غیر مقفل"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "مینیو|تجدید"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "تجدید"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "عمل %s لاگو نہیں کیا گیا ہے"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "ربط:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "نامعلوم"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "ریویزن:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "ریپازٹری:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "تبدیلی ریویزن:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "تبدیلی کی تاریخ:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "مصنف:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "تبدیلی کی فہرست:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "گہرائی:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "استثناء"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
msgid "Empty"
msgstr "خالی"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
msgid "Files"
msgstr "فائلیں"
@@ -328,565 +511,762 @@ msgstr "فائلیں"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
msgid "Immediates"
msgstr "فوراً"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
msgid "Infinity"
msgstr "مطلق"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "ورژن معلومات طبع کریں"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "شامل کرنے کی حرکت چلائیں"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "بلیم حرکت چلائیں"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "بلیم حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "صفائی حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "لاگ حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "لاگ حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "منتقلی کی حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "ریورٹ حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "حالت حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "حالت حرکت چلائیں"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "متعلقہ اختیارات شامل کریں:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "بلیم متعلقہ اختیارات:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "بلیم متعلقہ اختیارات:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "متعلقہ اختیارات کاپی کریں:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "متعلقہ اختیارات کا لاگ:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "متعلقہ اختیارات منتقل کریں:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "متعلقہ اختیارات منعکس کریں:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "متعلقہ اختیارات کی حالت:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "متعلقہ اختیارات کی حالت:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "لائن"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "ریویزن"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "مصنف"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "تاریخ"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "پاتھ"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "نظر انداز کردہ فائلیں دکھائیں"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "نظر انداز کردہ فائلیں دکھائیں"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "نظر انداز کردہ فائلیں دکھائیں"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "صاف کرنا مکمل ہوا"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "صاف کیا جارہا ہے..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "ناکام"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "منتتخب/نامنتخب تمام"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "مصنف"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "تبصرہ"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "پیغام"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "تبدیل شدہ"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "فائل"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "صاف کرنا مکمل ہوا"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "منتقل تا"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "منتقل کریں"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "حرکت"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "ری لوکیٹ مکمل شدہ"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "واپس"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "نام"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "_ریپازٹری:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "فولدر منتخب کریں"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "_ڈائریکٹری:"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "ٹرانسفر"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "تبدیلی کی فہرست حرکت چلائیں"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "چیک کریں"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "صفائی حرکت چلائیں"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "کمٹ حرکت چلائیں"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "کاپی حرکت چلائیں"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "حذف حرکت چلائیں"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "برآمد حرکت چلائیں"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "درآمد حرکت چلائیں"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "مقفل حرکت چلائیں"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "لاگ حرکت چلائیں"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "منتقلی کی حرکت چلائیں"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "خصوصیات حرکت چلائیں"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "ریزولوڈ حرکت چلائیں"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "ری لوکیٹ حرکت چلائیں"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "ریورٹ حرکت چلائیں"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "حالت حرکت چلائیں"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "تبدیلی حرکت چلائیں"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "غیر مقفل حرکت چلائیں"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "تجدید کریں"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "متعلقہ اختیارات شامل کریں:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "بلیم متعلقہ اختیارات:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "متعلقہ اختیارات کی تبدیلی فہرست:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "متعلقہ اختیارات چیک کریں:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "متعلقہ اختیارات صاف کریں:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "متعلقہ اختیارات کو کمٹ کریں:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "متعلقہ اختیارات کاپی کریں:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "متعلقہ اختیارات حذف کریں:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "متعلقہ اختیارات برآمد کریں:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "متعلقہ اختیارات درآمد کریں:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "متعلقہ اختیارات مقفل کریں:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "متعلقہ اختیارات کا لاگ:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "متعلقہ اختیارات منتقل کریں:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "متعلقہ اختیارات کی خصوصیات:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "خصوصیات"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "حل شدہ متعلقہ اختیارات:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "متعلقہ اختیارات دوبارہ تلاش کریں:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "متعلقہ اختیارات منعکس کریں:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "متعلقہ اختیارات کی حالت:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "متعلقہ اختیارات بدلیں:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "متعلقہ اختیارات غیر مقفل کریں:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "متعلقہ اختیارات اپڈیٹ کریں:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "کافی بحث دستیاب نہیں کی گئی"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "ناکام"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "لائن"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "ریویزن"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "مصنف"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "تاریخ"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "بلیم ناکام"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "صاف کرنا ناکام"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "صاف کرنا مکمل ہوا"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "صاف کیا جارہا ہے..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "ریویزن پر: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "کرنے کے لیے کچھ نہیں"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "مکمل"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "پیغام کمٹ کریں"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr ""
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "شامل کردہ"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "کاپی شدہ"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "حذف شدہ"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "بحال شدہ"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "ریورٹ شدہ"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "ریورٹ ناکام"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "نظر انداز شدہ"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "تجدید شدہ"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "خارجی"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "تبدیل شدہ"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "اوپر لکھا گیا"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "ارسال"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "مقفل"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "غیر مقفل"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "قفل ناکام"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "غیر مقفلی ناکام"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "موجود"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "تبدیلی کی فہرست سیٹ"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "تبدیلی کی فہرست صاف کردی گئی"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "تبدیلی کی فہرست منتقل کردی گئی"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "مرج شروع کردیا گیا"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "خارجی مرج شروع کردیا گیا"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "اوپر لکھیں"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
#, fuzzy
msgid "Property added"
msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
#, fuzzy
msgid "Property modified"
msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
#, fuzzy
msgid "Property deleted"
msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
#, fuzzy
msgid "Property nonexisting"
msgstr "خصوصیات"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
#, fuzzy
msgid "Revision property set"
msgstr "خصوصیت مرتب کرنے میں غلطی"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
#, fuzzy
msgid "Revision property deleted"
msgstr "خصوصیت مرتب کرنے میں غلطی"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
#, fuzzy
msgid "Merge completed"
msgstr "مکمل"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
#, fuzzy
msgid "Tree conflict"
msgstr "متضارب"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
#, fuzzy
msgid "External failed"
msgstr "خارجی"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "نا موزوں"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "غیر تبدیل شدہ"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "مفقود"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "ابسٹریکٹڈ"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "تبدیل شدہ"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "مرج شدہ"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "متضارب"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "سادہ"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "نظر انداز شدہ"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "نا مکمل"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "لوکل کاپی"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "کاپی تا"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "لوکل حذف"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "پیغام حذف کریں"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "_سرٹیفیکیٹ:"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "فائل منتخب کریں"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "یاد رکھیں"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "سرٹیفیکیٹ"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "پاتھ"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "منتتخب/نامنتخب تمام"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "پیغام درآمد کریں"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "پیغام"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "حرکت"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "فائل"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "حالت"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "لاگ پیغام"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "لاگ ناکام"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "_صارف نام:"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "_پاس ورڈ:"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "لاگ ان"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "حالت"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "لاگ پیغام"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "لوکل منتقلی"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "منتقل تا"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime نوعیت"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "اطلاعیہ"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "نام"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "خصوصیت مرتب کرنے میں غلطی"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "خصوصیات ناکام"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "قدر"
@@ -896,8 +1276,8 @@ msgstr "قدر"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "ذاتی"
@@ -907,8 +1287,8 @@ msgstr "ذاتی"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "فوری فائلیں"
@@ -918,155 +1298,90 @@ msgstr "فوری فائلیں"
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "تکراری"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "خصوصیت مرتب کرنے میں غلطی"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "خصوصیات ناکام"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "_از:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "فولدر منتخب کریں"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "_تا:"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "_ڈائریکٹری:"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "ری لوکیٹ ناکام"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "ری لوکیٹ مکمل شدہ"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "ری لوکیٹ کیا جارہا ہے..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "_از:"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "_تا:"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "حالت ناکام"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "غیر تبدیل شدہ فائلیں دکھائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "غیر ورژن شدہ فائلیں دکھائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "نظر انداز کردہ فائلیں دکھائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "خارجی چھپائیں"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "ریپازٹری چیک کریں"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "حالت ناکام"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "_ریپازٹری:"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "ٹرانسفر"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "سرٹیفیکیٹ ابھی کارآمد نہیں."
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "سرٹیفیکیٹ ایکسپائر ہے."
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "سرٹیفیکیٹ ریموٹ ہوسٹ نیم سے مطابقت نہیں رکھتا."
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "سرٹیفیکیٹ اتھارٹی نا معلوم ہے."
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "دیگر ناکامی."
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "اعتماد"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "بلیم حرکت چلائیں"
+#~ msgid "Execute remove action"
+#~ msgstr "منتقلی کی حرکت چلائیں"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "ریورٹ حرکت چلائیں"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "بلیم متعلقہ اختیارات:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "حل شدہ متعلقہ اختیارات:"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "متعلقہ اختیارات منعکس کریں:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "واپس"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "صاف کرنا مکمل ہوا"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "صاف کرنا مکمل ہوا"
#~ msgid "SVN _Checkout"
#~ msgstr "SVN _چیک آؤٹ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bb9b539..0d2fa40 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 01:00+0200\n"
+"POT-Creation-Date: 2009-11-08 16:59+0100\n"
"PO-Revision-Date: 2009-06-22 02:22+0800\n"
"Last-Translator: Hunt Xu <huntxu at live.cn>\n"
"Language-Team: Chinese (simplified) <xfce-i18n at xfce.org>\n"
@@ -15,296 +15,479 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#. append the svn submenu action
-#. Lets see if we are dealing with a working copy
-#: thunar-vcs-plugin/tvp-provider.c:455 thunar-vcs-plugin/tvp-provider.c:496
-msgid "SVN"
-msgstr "SVN"
-
-#. append the git submenu action
-#: thunar-vcs-plugin/tvp-provider.c:462 thunar-vcs-plugin/tvp-provider.c:503
-msgid "GIT"
-msgstr ""
-
-#: thunar-vcs-plugin/tvp-svn-action.c:298
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301
msgid "Menu|Add"
msgstr "Add"
-#: thunar-vcs-plugin/tvp-svn-action.c:298 tvp-svn-helper/main.c:246
-#: tvp-svn-helper/tsh-add.c:113 tvp-svn-helper/tsh-add.c:126
-#: tvp-git-helper/main.c:98 tvp-git-helper/tgh-add.c:113
+#: ../thunar-vcs-plugin/tvp-git-action.c:264
+#: ../thunar-vcs-plugin/tvp-svn-action.c:301 ../tvp-git-helper/main.c:151
+#: ../tvp-git-helper/tgh-add.c:97 ../tvp-git-helper/tgh-add.c:110
+#: ../tvp-svn-helper/main.c:249 ../tvp-svn-helper/tsh-add.c:116
+#: ../tvp-svn-helper/tsh-add.c:129
msgid "Add"
msgstr "Add"
-#: thunar-vcs-plugin/tvp-svn-action.c:303
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+#, fuzzy
+msgid "Menu|Bisect"
+msgstr "Blame"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:265
+msgid "Bisect"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306
msgid "Menu|Blame"
msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:303 tvp-svn-helper/main.c:250
-#: tvp-svn-helper/main.c:254 tvp-svn-helper/tsh-blame-dialog.c:133
+#: ../thunar-vcs-plugin/tvp-git-action.c:267
+#: ../thunar-vcs-plugin/tvp-svn-action.c:306 ../tvp-git-helper/main.c:155
+#: ../tvp-git-helper/tgh-blame-dialog.c:130 ../tvp-svn-helper/main.c:253
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-blame-dialog.c:133
msgid "Blame"
msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Menu|Changelist"
-msgstr "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269
+#, fuzzy
+msgid "Menu|Branch"
+msgstr "Blame"
-#: thunar-vcs-plugin/tvp-svn-action.c:315
-msgid "Changelist"
-msgstr "Changelist"
+#: ../thunar-vcs-plugin/tvp-git-action.c:269 ../tvp-git-helper/main.c:159
+#: ../tvp-git-helper/tgh-branch-dialog.c:119
+#: ../tvp-git-helper/tgh-stash-dialog.c:168
+msgid "Branch"
+msgstr ""
-#: thunar-vcs-plugin/tvp-svn-action.c:320
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323
msgid "Menu|Checkout"
msgstr "Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:320 tvp-svn-helper/main.c:258
-#: tvp-svn-helper/tsh-checkout.c:98 tvp-svn-helper/tsh-checkout.c:110
+#: ../thunar-vcs-plugin/tvp-git-action.c:270
+#: ../thunar-vcs-plugin/tvp-svn-action.c:323 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/tsh-checkout.c:98 ../tvp-svn-helper/tsh-checkout.c:110
msgid "Checkout"
msgstr "Checkout"
-#: thunar-vcs-plugin/tvp-svn-action.c:325
-msgid "Menu|Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271
+#, fuzzy
+msgid "Menu|Clean"
msgstr "Cleanup"
-#: thunar-vcs-plugin/tvp-svn-action.c:325 tvp-svn-helper/main.c:262
-msgid "Cleanup"
+#: ../thunar-vcs-plugin/tvp-git-action.c:271 ../tvp-git-helper/main.c:163
+#: ../tvp-git-helper/tgh-clean.c:141 ../tvp-git-helper/tgh-clean-dialog.c:97
+#, fuzzy
+msgid "Clean"
msgstr "Cleanup"
-#: thunar-vcs-plugin/tvp-svn-action.c:330
+#: ../thunar-vcs-plugin/tvp-git-action.c:273
+#, fuzzy
+msgid "Menu|Clone"
+msgstr "Copy"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:273 ../tvp-git-helper/main.c:167
+#: ../tvp-git-helper/tgh-clone.c:112
+msgid "Clone"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
msgid "Menu|Commit"
msgstr "Commit"
-#: thunar-vcs-plugin/tvp-svn-action.c:330 tvp-svn-helper/main.c:266
-#: tvp-svn-helper/tsh-commit.c:127 tvp-svn-helper/tsh-commit.c:140
+#: ../thunar-vcs-plugin/tvp-git-action.c:274
+#: ../thunar-vcs-plugin/tvp-svn-action.c:333
+#: ../tvp-git-helper/tgh-log-dialog.c:137 ../tvp-svn-helper/main.c:269
+#: ../tvp-svn-helper/tsh-commit.c:223 ../tvp-svn-helper/tsh-commit.c:236
msgid "Commit"
msgstr "Commit"
-#: thunar-vcs-plugin/tvp-svn-action.c:335
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Menu|Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:275
+#: ../thunar-vcs-plugin/tvp-svn-action.c:348
+msgid "Diff"
+msgstr "Diff"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+#, fuzzy
+msgid "Menu|Fetch"
+msgstr "Switch"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:276
+msgid "Fetch"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+#, fuzzy
+msgid "Menu|Grep"
+msgstr "Cleanup"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:277
+msgid "Grep"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Menu|Init"
+msgstr "Info"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:278
+#, fuzzy
+msgid "Init"
+msgstr "无穷 (取出当前文件或递归取出当前目录及其子目录中的内容)"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378
+msgid "Menu|Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:279
+#: ../thunar-vcs-plugin/tvp-svn-action.c:378 ../tvp-git-helper/main.c:171
+#: ../tvp-git-helper/tgh-log-dialog.c:215 ../tvp-svn-helper/main.c:293
+#: ../tvp-svn-helper/tsh-log-dialog.c:208
+msgid "Log"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Menu|Merge"
+msgstr "Move"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:280
+#, fuzzy
+msgid "Merge"
+msgstr "已被合并"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393
+msgid "Menu|Move"
+msgstr "Move"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:282
+#: ../thunar-vcs-plugin/tvp-svn-action.c:393 ../tvp-git-helper/main.c:175
+#: ../tvp-svn-helper/main.c:297 ../tvp-svn-helper/tsh-move.c:157
+msgid "Move"
+msgstr "Move"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+#, fuzzy
+msgid "Menu|Pull"
+msgstr "Blame"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:283
+msgid "Pull"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+#, fuzzy
+msgid "Menu|Push"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:284
+msgid "Push"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Menu|Rebase"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:285
+#, fuzzy
+msgid "Rebase"
+msgstr "Revert"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286
+#, fuzzy
+msgid "Menu|Reset"
+msgstr "Revert"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:286 ../tvp-git-helper/main.c:179
+#: ../tvp-git-helper/tgh-reset.c:130
+#, fuzzy
+msgid "Reset"
+msgstr "Revert"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Menu|Remove"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:287
+#, fuzzy
+msgid "Remove"
+msgstr "Resolve"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+#, fuzzy
+msgid "Menu|Show"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:288
+msgid "Show"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:290
+#, fuzzy
+msgid "Menu|Stash"
+msgstr "Status"
+
+#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+#. gtk_widget_show (box);
+#: ../thunar-vcs-plugin/tvp-git-action.c:290 ../tvp-git-helper/main.c:183
+#: ../tvp-git-helper/tgh-stash-dialog.c:264
+#, fuzzy
+msgid "Stash"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430
+msgid "Menu|Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:292
+#: ../thunar-vcs-plugin/tvp-svn-action.c:430 ../tvp-git-helper/main.c:187
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:122
+#: ../tvp-git-helper/tgh-status-dialog.c:125 ../tvp-svn-helper/main.c:317
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:146
+#: ../tvp-svn-helper/tsh-status-dialog.c:247
+msgid "Status"
+msgstr "Status"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+#, fuzzy
+msgid "Menu|Tag"
+msgstr "Log"
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:293
+msgid "Tag"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-git-action.c:302
+#: ../thunar-vcs-plugin/tvp-svn-action.c:455
+#, c-format
+msgid "Action %s is unimplemented"
+msgstr "操作 %s 未实现"
+
+#. append the svn submenu action
+#. Lets see if we are dealing with a working copy
+#: ../thunar-vcs-plugin/tvp-provider.c:464
+#: ../thunar-vcs-plugin/tvp-provider.c:527
+msgid "SVN"
+msgstr "SVN"
+
+#. append the git submenu action
+#: ../thunar-vcs-plugin/tvp-provider.c:493
+#: ../thunar-vcs-plugin/tvp-provider.c:534
+msgid "GIT"
+msgstr ""
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Menu|Changelist"
+msgstr "Changelist"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:318
+msgid "Changelist"
+msgstr "Changelist"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328
+msgid "Menu|Cleanup"
+msgstr "Cleanup"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:328 ../tvp-svn-helper/main.c:265
+msgid "Cleanup"
+msgstr "Cleanup"
+
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338
msgid "Menu|Copy"
msgstr "Copy"
-#: thunar-vcs-plugin/tvp-svn-action.c:335 tvp-svn-helper/main.c:270
-#: tvp-svn-helper/tsh-copy.c:165
+#: ../thunar-vcs-plugin/tvp-svn-action.c:338 ../tvp-svn-helper/main.c:273
+#: ../tvp-svn-helper/tsh-copy.c:166
msgid "Copy"
msgstr "Copy"
-#: thunar-vcs-plugin/tvp-svn-action.c:340
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343
msgid "Menu|Delete"
msgstr "Delete"
-#: thunar-vcs-plugin/tvp-svn-action.c:340 tvp-svn-helper/main.c:274
-#: tvp-svn-helper/tsh-delete.c:127 tvp-svn-helper/tsh-delete.c:140
+#: ../thunar-vcs-plugin/tvp-svn-action.c:343 ../tvp-svn-helper/main.c:277
+#: ../tvp-svn-helper/tsh-delete.c:127 ../tvp-svn-helper/tsh-delete.c:140
msgid "Delete"
msgstr "Delete"
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Menu|Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:345
-msgid "Diff"
-msgstr "Diff"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:350
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353
msgid "Menu|Export"
msgstr "Export"
-#: thunar-vcs-plugin/tvp-svn-action.c:350 tvp-svn-helper/main.c:278
-#: tvp-svn-helper/tsh-export.c:107 tvp-svn-helper/tsh-export.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:353 ../tvp-svn-helper/main.c:281
+#: ../tvp-svn-helper/tsh-export.c:107 ../tvp-svn-helper/tsh-export.c:125
msgid "Export"
msgstr "Export"
-#: thunar-vcs-plugin/tvp-svn-action.c:355
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358
msgid "Menu|Import"
msgstr "Import"
-#: thunar-vcs-plugin/tvp-svn-action.c:355 tvp-svn-helper/main.c:282
-#: tvp-svn-helper/tsh-import.c:102 tvp-svn-helper/tsh-import.c:120
+#: ../thunar-vcs-plugin/tvp-svn-action.c:358 ../tvp-svn-helper/main.c:285
+#: ../tvp-svn-helper/tsh-import.c:102 ../tvp-svn-helper/tsh-import.c:120
msgid "Import"
msgstr "Import"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Menu|Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:360
+#: ../thunar-vcs-plugin/tvp-svn-action.c:363
msgid "Info"
msgstr "Info"
-#: thunar-vcs-plugin/tvp-svn-action.c:370
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373
msgid "Menu|Lock"
msgstr "Lock"
-#: thunar-vcs-plugin/tvp-svn-action.c:370 tvp-svn-helper/main.c:286
-#: tvp-svn-helper/tsh-lock-dialog.c:72 tvp-svn-helper/tsh-lock.c:130
+#: ../thunar-vcs-plugin/tvp-svn-action.c:373 ../tvp-svn-helper/main.c:289
+#: ../tvp-svn-helper/tsh-lock.c:130 ../tvp-svn-helper/tsh-lock-dialog.c:72
msgid "Lock"
msgstr "Lock"
-#: thunar-vcs-plugin/tvp-svn-action.c:375
-msgid "Menu|Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:375 tvp-svn-helper/main.c:290
-#: tvp-svn-helper/tsh-log-dialog.c:201
-msgid "Log"
-msgstr "Log"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390
-msgid "Menu|Move"
-msgstr "Move"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:390 tvp-svn-helper/main.c:294
-#: tvp-svn-helper/tsh-move.c:156
-msgid "Move"
-msgstr "Move"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Menu|Edit Properties"
msgstr "Propedit"
-#: thunar-vcs-plugin/tvp-svn-action.c:401
+#: ../thunar-vcs-plugin/tvp-svn-action.c:404
msgid "Edit Properties"
msgstr "Propedit"
-#: thunar-vcs-plugin/tvp-svn-action.c:406
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409
msgid "Menu|Relocate"
msgstr "Relocate"
-#: thunar-vcs-plugin/tvp-svn-action.c:406 tvp-svn-helper/main.c:306
-#: tvp-svn-helper/tsh-relocate-dialog.c:217 tvp-svn-helper/tsh-relocate.c:114
+#: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-svn-helper/main.c:309
+#: ../tvp-svn-helper/tsh-relocate.c:114
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:217
msgid "Relocate"
msgstr "Relocate"
-#: thunar-vcs-plugin/tvp-svn-action.c:412
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415
msgid "Menu|Resolved"
msgstr "Resolved"
-#: thunar-vcs-plugin/tvp-svn-action.c:412 tvp-svn-helper/main.c:302
-#: tvp-svn-helper/tsh-common.c:500 tvp-svn-helper/tsh-resolved.c:113
-#: tvp-svn-helper/tsh-resolved.c:126
+#: ../thunar-vcs-plugin/tvp-svn-action.c:415 ../tvp-svn-helper/main.c:305
+#: ../tvp-svn-helper/tsh-common.c:521 ../tvp-svn-helper/tsh-resolved.c:113
+#: ../tvp-svn-helper/tsh-resolved.c:126
msgid "Resolved"
msgstr "Resolved"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Menu|Resolve"
msgstr "Resolve"
-#: thunar-vcs-plugin/tvp-svn-action.c:417
+#: ../thunar-vcs-plugin/tvp-svn-action.c:420
msgid "Resolve"
msgstr "Resolve"
-#: thunar-vcs-plugin/tvp-svn-action.c:422
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425
msgid "Menu|Revert"
msgstr "Revert"
-#: thunar-vcs-plugin/tvp-svn-action.c:422 tvp-svn-helper/main.c:310
-#: tvp-svn-helper/tsh-revert.c:112 tvp-svn-helper/tsh-revert.c:125
+#: ../thunar-vcs-plugin/tvp-svn-action.c:425 ../tvp-svn-helper/main.c:313
+#: ../tvp-svn-helper/tsh-revert.c:112 ../tvp-svn-helper/tsh-revert.c:125
msgid "Revert"
msgstr "Revert"
-#: thunar-vcs-plugin/tvp-svn-action.c:427
-msgid "Menu|Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:427 tvp-svn-helper/main.c:314
-#: tvp-svn-helper/tsh-file-selection-dialog.c:125
-#: tvp-svn-helper/tsh-status-dialog.c:247 tvp-git-helper/main.c:110
-#: tvp-git-helper/tgh-file-selection-dialog.c:120
-#: tvp-git-helper/tgh-reset-dialog.c:93 tvp-git-helper/tgh-status-dialog.c:125
-msgid "Status"
-msgstr "Status"
-
-#: thunar-vcs-plugin/tvp-svn-action.c:432
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435
msgid "Menu|Switch"
msgstr "Switch"
-#: thunar-vcs-plugin/tvp-svn-action.c:432 tvp-svn-helper/main.c:318
-#: tvp-svn-helper/tsh-switch.c:109 tvp-svn-helper/tsh-switch.c:122
+#: ../thunar-vcs-plugin/tvp-svn-action.c:435 ../tvp-svn-helper/main.c:321
+#: ../tvp-svn-helper/tsh-switch.c:109 ../tvp-svn-helper/tsh-switch.c:122
msgid "Switch"
msgstr "Switch"
-#: thunar-vcs-plugin/tvp-svn-action.c:437
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440
msgid "Menu|Unlock"
msgstr "Unlock"
-#: thunar-vcs-plugin/tvp-svn-action.c:437 tvp-svn-helper/main.c:322
-#: tvp-svn-helper/tsh-unlock.c:111
+#: ../thunar-vcs-plugin/tvp-svn-action.c:440 ../tvp-svn-helper/main.c:325
+#: ../tvp-svn-helper/tsh-unlock.c:111
msgid "Unlock"
msgstr "Unlock"
-#: thunar-vcs-plugin/tvp-svn-action.c:442
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445
msgid "Menu|Update"
msgstr "Update"
-#: thunar-vcs-plugin/tvp-svn-action.c:442 tvp-svn-helper/main.c:326
-#: tvp-svn-helper/tsh-update.c:113
+#: ../thunar-vcs-plugin/tvp-svn-action.c:445 ../tvp-svn-helper/main.c:329
+#: ../tvp-svn-helper/tsh-update.c:113
msgid "Update"
msgstr "Update"
-#: thunar-vcs-plugin/tvp-svn-action.c:452
-#, c-format
-msgid "Action %s is unimplemented"
-msgstr "操作 %s 未实现"
-
-#: thunar-vcs-plugin/tvp-svn-property-page.c:118
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:118
msgid "URL:"
msgstr "URL:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:124
-#: thunar-vcs-plugin/tvp-svn-property-page.c:137
-#: thunar-vcs-plugin/tvp-svn-property-page.c:149
-#: thunar-vcs-plugin/tvp-svn-property-page.c:167
-#: thunar-vcs-plugin/tvp-svn-property-page.c:179
-#: thunar-vcs-plugin/tvp-svn-property-page.c:192
-#: thunar-vcs-plugin/tvp-svn-property-page.c:222
-#: thunar-vcs-plugin/tvp-svn-property-page.c:300
-#: tvp-svn-helper/tsh-common.c:539 tvp-svn-helper/tsh-common.c:597
-#: tvp-svn-helper/tsh-common.c:606 tvp-svn-helper/tsh-common.c:628
-#: tvp-svn-helper/tsh-common.c:645 tvp-svn-helper/tsh-common.c:672
-#: tvp-svn-helper/tsh-common.c:762
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:124
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:137
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:149
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:167
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:179
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:192
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:222
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:300
+#: ../tvp-svn-helper/tsh-common.c:560 ../tvp-svn-helper/tsh-common.c:618
+#: ../tvp-svn-helper/tsh-common.c:627 ../tvp-svn-helper/tsh-common.c:649
+#: ../tvp-svn-helper/tsh-common.c:666 ../tvp-svn-helper/tsh-common.c:695
+#: ../tvp-svn-helper/tsh-common.c:785
msgid "Unknown"
msgstr "未知"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:131
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:131
msgid "Revision:"
msgstr "修订版本:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:143
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:143
msgid "Repository:"
msgstr "仓库:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:161
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:161
msgid "Modified revision:"
msgstr "已修改版本:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:173
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:173
msgid "Modified date:"
msgstr "修改日期:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:186
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:186
msgid "Author:"
msgstr "作者:"
-#: thunar-vcs-plugin/tvp-svn-property-page.c:203
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:203
msgid "Changelist:"
msgstr "更新列表:"
#. Translators: Depth as in depth of recursion
-#: thunar-vcs-plugin/tvp-svn-property-page.c:216
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:216
msgid "Depth:"
msgstr "深度:"
#. Translators: svn recursion depth infotmation
#. * Exclude should not apear client side
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:306
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:306
msgid "Exclude"
msgstr "排除"
#. Translators: svn recursion depth infotmation
#. * Empty depth means only this file/direcotry is checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:312
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:312
#, fuzzy
msgid "Empty"
msgstr "空 (只取出当前文件或目录)"
@@ -312,7 +495,7 @@ msgstr "空 (只取出当前文件或目录)"
#. Translators: svn recursion depth infotmation
#. * Files depth means this file/direcotry and all of it's files are checked out
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:318
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:318
#, fuzzy
msgid "Files"
msgstr "文件 (取出当前的文件或目录中的内容)"
@@ -326,9 +509,9 @@ msgstr "文件 (取出当前的文件或目录中的内容)"
#. Translators: svn recursion selection
#. * Immediates means this file/direcotry and the subdirectories are shown
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:324
-#: tvp-svn-helper/tsh-properties-dialog.c:229
-#: tvp-svn-helper/tsh-status-dialog.c:200
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:324
+#: ../tvp-svn-helper/tsh-properties-dialog.c:227
+#: ../tvp-svn-helper/tsh-status-dialog.c:200
#, fuzzy
msgid "Immediates"
msgstr "立即 (当前文件或当前目录及其子文件夹内容)"
@@ -336,548 +519,745 @@ msgstr "立即 (当前文件或当前目录及其子文件夹内容)"
#. Translators: svn recursion depth infotmation
#. * Infinity depth means this file/direcotry is checked out with full recursion
#.
-#: thunar-vcs-plugin/tvp-svn-property-page.c:330
+#: ../thunar-vcs-plugin/tvp-svn-property-page.c:330
#, fuzzy
msgid "Infinity"
msgstr "无穷 (取出当前文件或递归取出当前目录及其子目录中的内容)"
-#: tvp-svn-helper/main.c:105 tvp-git-helper/main.c:64
+#: ../tvp-git-helper/main.c:78 ../tvp-svn-helper/main.c:105
msgid "Print version information"
msgstr "打印版本信息"
-#: tvp-svn-helper/main.c:112 tvp-git-helper/main.c:71
+#: ../tvp-git-helper/main.c:85 ../tvp-svn-helper/main.c:112
msgid "Execute add action"
msgstr "执行 add 操作"
-#: tvp-svn-helper/main.c:118
+#: ../tvp-git-helper/main.c:91 ../tvp-svn-helper/main.c:118
msgid "Execute blame action"
msgstr "执行 blame 操作"
-#: tvp-svn-helper/main.c:124
+#: ../tvp-git-helper/main.c:97
+#, fuzzy
+msgid "Execute branch action"
+msgstr "执行 blame 操作"
+
+#: ../tvp-git-helper/main.c:103
+#, fuzzy
+msgid "Execute clean action"
+msgstr "执行 cleanup 操作"
+
+#: ../tvp-git-helper/main.c:109
+#, fuzzy
+msgid "Execute clone action"
+msgstr "执行 log 操作"
+
+#: ../tvp-git-helper/main.c:115 ../tvp-svn-helper/main.c:178
+msgid "Execute log action"
+msgstr "执行 log 操作"
+
+#: ../tvp-git-helper/main.c:121 ../tvp-svn-helper/main.c:184
+msgid "Execute move action"
+msgstr "执行 move 操作"
+
+#: ../tvp-git-helper/main.c:127
+#, fuzzy
+msgid "Execute reset action"
+msgstr "执行 revert 操作"
+
+#: ../tvp-git-helper/main.c:133
+#, fuzzy
+msgid "Execute stash action"
+msgstr "执行 status 操作"
+
+#: ../tvp-git-helper/main.c:139 ../tvp-svn-helper/main.c:214
+msgid "Execute status action"
+msgstr "执行 status 操作"
+
+#: ../tvp-git-helper/main.c:151 ../tvp-svn-helper/main.c:249
+msgid "Add Related Options:"
+msgstr "Add 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:155 ../tvp-svn-helper/main.c:253
+msgid "Blame Related Options:"
+msgstr "Blame 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:159
+#, fuzzy
+msgid "Branch Related Options:"
+msgstr "Blame 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:163 ../tvp-git-helper/main.c:167
+#, fuzzy
+msgid "Clone Related Options:"
+msgstr "Copy 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:171 ../tvp-svn-helper/main.c:293
+msgid "Log Related Options:"
+msgstr "Log 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:175 ../tvp-svn-helper/main.c:297
+msgid "Move Related Options:"
+msgstr "Move 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:179
+#, fuzzy
+msgid "Reset Related Options:"
+msgstr "Revert 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:183
+#, fuzzy
+msgid "Stash Related Options:"
+msgstr "Status 操作相关选项:"
+
+#: ../tvp-git-helper/main.c:187 ../tvp-svn-helper/main.c:317
+msgid "Status Related Options:"
+msgstr "Status 操作相关选项:"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:91
+#: ../tvp-svn-helper/tsh-blame-dialog.c:94
+msgid "Line"
+msgstr "行"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:97
+#: ../tvp-git-helper/tgh-log-dialog.c:119
+#: ../tvp-svn-helper/tsh-blame-dialog.c:100
+#: ../tvp-svn-helper/tsh-log-dialog.c:124
+msgid "Revision"
+msgstr "修订版本"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:103
+#: ../tvp-git-helper/tgh-log-dialog.c:125
+#: ../tvp-svn-helper/tsh-blame-dialog.c:106
+#: ../tvp-svn-helper/tsh-log-dialog.c:130
+msgid "Author"
+msgstr "作者"
+
+#: ../tvp-git-helper/tgh-blame-dialog.c:109
+#: ../tvp-svn-helper/tsh-blame-dialog.c:112
+#: ../tvp-svn-helper/tsh-log-dialog.c:136
+msgid "Date"
+msgstr "日期"
+
+#: ../tvp-git-helper/tgh-branch-dialog.c:104
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:94
+#: ../tvp-git-helper/tgh-notify-dialog.c:93
+#: ../tvp-git-helper/tgh-status-dialog.c:104
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:111
+#: ../tvp-svn-helper/tsh-log-dialog.c:186
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:99
+#: ../tvp-svn-helper/tsh-notify-dialog.c:94
+#: ../tvp-svn-helper/tsh-status-dialog.c:118
+msgid "Path"
+msgstr "路径"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:57
+msgid "Remove directories."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:69
+#, fuzzy
+msgid "Excldue ignored files"
+msgstr "显示被忽略的文件"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:77
+#, fuzzy
+msgid "Include ignored files"
+msgstr "显示被忽略的文件"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:83
+#, fuzzy
+msgid "Only ignored files"
+msgstr "显示被忽略的文件"
+
+#: ../tvp-git-helper/tgh-clean-dialog.c:93
+msgid "Force clean."
+msgstr ""
+
+#: ../tvp-git-helper/tgh-clone.c:58
+#, fuzzy
+msgid "Clone finished"
+msgstr "Cleanup 操作完成"
+
+#: ../tvp-git-helper/tgh-clone.c:123
+#, fuzzy
+msgid "Cloning ..."
+msgstr "正在进行 cleanup 操作..."
+
+#: ../tvp-git-helper/tgh-common.c:80 ../tvp-svn-helper/tsh-add.c:73
+#: ../tvp-svn-helper/tsh-add.c:91 ../tvp-svn-helper/tsh-checkout.c:71
+#: ../tvp-svn-helper/tsh-commit.c:97 ../tvp-svn-helper/tsh-commit.c:127
+#: ../tvp-svn-helper/tsh-commit.c:184 ../tvp-svn-helper/tsh-copy.c:87
+#: ../tvp-svn-helper/tsh-delete.c:91 ../tvp-svn-helper/tsh-export.c:72
+#: ../tvp-svn-helper/tsh-import.c:72 ../tvp-svn-helper/tsh-lock.c:91
+#: ../tvp-svn-helper/tsh-move.c:77 ../tvp-svn-helper/tsh-resolved.c:73
+#: ../tvp-svn-helper/tsh-resolved.c:89 ../tvp-svn-helper/tsh-revert.c:87
+#: ../tvp-svn-helper/tsh-switch.c:71 ../tvp-svn-helper/tsh-unlock.c:86
+#: ../tvp-svn-helper/tsh-update.c:88
+msgid "Failed"
+msgstr "失败"
+
+#: ../tvp-git-helper/tgh-common.c:199
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:251
+msgid "untracked"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-file-selection-dialog.c:115
+#: ../tvp-svn-helper/tsh-file-selection-dialog.c:139
+msgid "Select/Unselect all"
+msgstr "全选/全不选"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:131
+#, fuzzy
+msgid "AuthorDate"
+msgstr "作者"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:143
+#, fuzzy
+msgid "CommitDate"
+msgstr "Commit"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:149
+#: ../tvp-svn-helper/tsh-log-dialog.c:142
+msgid "Message"
+msgstr "信息"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:187
+#: ../tvp-git-helper/tgh-stash-dialog.c:198
+#, fuzzy
+msgid "Changes"
+msgstr "已被改变"
+
+#: ../tvp-git-helper/tgh-log-dialog.c:194
+#: ../tvp-git-helper/tgh-stash-dialog.c:205
+msgid "File"
+msgstr "文件"
+
+#: ../tvp-git-helper/tgh-move.c:58
+#, fuzzy
+msgid "Move finished"
+msgstr "Cleanup 操作完成"
+
+#: ../tvp-git-helper/tgh-move.c:135 ../tvp-svn-helper/tsh-move.c:137
+msgid "Move To"
+msgstr "移动到"
+
+#: ../tvp-git-helper/tgh-move.c:151
+#, fuzzy
+msgid "Move ..."
+msgstr "Move"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:87
+#: ../tvp-svn-helper/tsh-log-dialog.c:180
+#: ../tvp-svn-helper/tsh-notify-dialog.c:88
+msgid "Action"
+msgstr "操作"
+
+#: ../tvp-git-helper/tgh-notify-dialog.c:108
+msgid "Notify"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-reset.c:58
+#, fuzzy
+msgid "Reset finished"
+msgstr "Relocate 操作完成"
+
+#: ../tvp-git-helper/tgh-reset.c:143
+#, fuzzy
+msgid "Reset ..."
+msgstr "Revert"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:162
+#: ../tvp-svn-helper/tsh-properties-dialog.c:126
+msgid "Name"
+msgstr "名称"
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:174
+msgid "Description"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:438
+msgid "Stash description:"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:574
+#, c-format
+msgid "Are you sure you want to drop %s?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-stash-dialog.c:602
+msgid "Are you sure you want to clear all stash?"
+msgstr ""
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:67
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:82
+msgid "_Repository:"
+msgstr "仓库(_R):"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:76
+#: ../tvp-git-helper/tgh-transfer-dialog.c:111
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:98
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:153
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:159
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:205
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:92
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:98
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:144
+msgid "Select a folder"
+msgstr "选择一个文件夹"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:104
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:198
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:137
+msgid "_Directory:"
+msgstr "目录(_D):"
+
+#: ../tvp-git-helper/tgh-transfer-dialog.c:123
+#: ../tvp-svn-helper/tsh-transfer-dialog.c:156
+msgid "Transfer"
+msgstr "传输"
+
+#: ../tvp-svn-helper/main.c:124
msgid "Execute changelist action"
msgstr "执行 changelist 操作"
-#: tvp-svn-helper/main.c:130
+#: ../tvp-svn-helper/main.c:130
msgid "Execute checkout action"
msgstr "执行 checkout 操作"
-#: tvp-svn-helper/main.c:136
+#: ../tvp-svn-helper/main.c:136
msgid "Execute cleanup action"
msgstr "执行 cleanup 操作"
-#: tvp-svn-helper/main.c:142
+#: ../tvp-svn-helper/main.c:142
msgid "Execute commit action"
msgstr "执行 commit 操作"
-#: tvp-svn-helper/main.c:148
+#: ../tvp-svn-helper/main.c:148
msgid "Execute copy action"
msgstr "执行 copy 操作"
-#: tvp-svn-helper/main.c:154
+#: ../tvp-svn-helper/main.c:154
msgid "Execute delete action"
msgstr "执行 delete 操作"
-#: tvp-svn-helper/main.c:160
+#: ../tvp-svn-helper/main.c:160
msgid "Execute export action"
msgstr "执行 export 操作"
-#: tvp-svn-helper/main.c:166
+#: ../tvp-svn-helper/main.c:166
msgid "Execute import action"
msgstr "执行 import 操作"
-#: tvp-svn-helper/main.c:172
+#: ../tvp-svn-helper/main.c:172
msgid "Execute lock action"
msgstr "执行 lock 操作"
-#: tvp-svn-helper/main.c:178
-msgid "Execute log action"
-msgstr "执行 log 操作"
-
-#: tvp-svn-helper/main.c:184
-msgid "Execute move action"
-msgstr "执行 move 操作"
-
-#: tvp-svn-helper/main.c:190
+#: ../tvp-svn-helper/main.c:190
msgid "Execute properties action"
msgstr "执行 prop 操作 (propdel/propedit/propget/proplist/propset)"
-#: tvp-svn-helper/main.c:196
+#: ../tvp-svn-helper/main.c:196
msgid "Execute resolved action"
msgstr "执行 resolved 操作"
-#: tvp-svn-helper/main.c:202
+#: ../tvp-svn-helper/main.c:202
msgid "Execute relocate action"
msgstr "执行 relocate 操作"
-#: tvp-svn-helper/main.c:208
+#: ../tvp-svn-helper/main.c:208
msgid "Execute revert action"
msgstr "执行 revert 操作"
-#: tvp-svn-helper/main.c:214 tvp-git-helper/main.c:89
-msgid "Execute status action"
-msgstr "执行 status 操作"
-
-#: tvp-svn-helper/main.c:220
+#: ../tvp-svn-helper/main.c:220
msgid "Execute switch action"
msgstr "执行 switch 操作"
-#: tvp-svn-helper/main.c:226
+#: ../tvp-svn-helper/main.c:226
msgid "Execute unlock action"
msgstr "执行 unlock 操作"
-#: tvp-svn-helper/main.c:232
+#: ../tvp-svn-helper/main.c:232
msgid "Execute update action"
msgstr "执行 update 操作"
-#: tvp-svn-helper/main.c:246 tvp-git-helper/main.c:98
-msgid "Add Related Options:"
-msgstr "Add 操作相关选项:"
-
-#: tvp-svn-helper/main.c:250
-msgid "Blame Related Options:"
-msgstr "Blame 操作相关选项:"
-
-#: tvp-svn-helper/main.c:254
+#: ../tvp-svn-helper/main.c:257
msgid "Changelist Related Options:"
msgstr "Changelist 操作相关选项:"
-#: tvp-svn-helper/main.c:258
+#: ../tvp-svn-helper/main.c:261
msgid "Checkout Related Options:"
msgstr "Checkout 操作相关选项:"
-#: tvp-svn-helper/main.c:262
+#: ../tvp-svn-helper/main.c:265
msgid "Cleanup Related Options:"
msgstr "Cleanup 操作相关选项:"
-#: tvp-svn-helper/main.c:266
+#: ../tvp-svn-helper/main.c:269
msgid "Commit Related Options:"
msgstr "Commit 操作相关选项:"
-#: tvp-svn-helper/main.c:270
+#: ../tvp-svn-helper/main.c:273
msgid "Copy Related Options:"
msgstr "Copy 操作相关选项:"
-#: tvp-svn-helper/main.c:274
+#: ../tvp-svn-helper/main.c:277
msgid "Delete Related Options:"
msgstr "Delete 操作相关选项:"
-#: tvp-svn-helper/main.c:278
+#: ../tvp-svn-helper/main.c:281
msgid "Export Related Options:"
msgstr "Export 操作相关选项:"
-#: tvp-svn-helper/main.c:282
+#: ../tvp-svn-helper/main.c:285
msgid "Import Related Options:"
msgstr "Import 操作相关选项:"
-#: tvp-svn-helper/main.c:286
+#: ../tvp-svn-helper/main.c:289
msgid "Lock Related Options:"
msgstr "Lock 操作相关选项:"
-#: tvp-svn-helper/main.c:290
-msgid "Log Related Options:"
-msgstr "Log 操作相关选项:"
-
-#: tvp-svn-helper/main.c:294
-msgid "Move Related Options:"
-msgstr "Move 操作相关选项:"
-
-#: tvp-svn-helper/main.c:298
+#: ../tvp-svn-helper/main.c:301
msgid "Properties Related Options:"
msgstr "Prop 操作相关选项:"
#. gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
#. gtk_widget_show (box);
-#: tvp-svn-helper/main.c:298 tvp-svn-helper/tsh-properties-dialog.c:283
+#: ../tvp-svn-helper/main.c:301 ../tvp-svn-helper/tsh-properties-dialog.c:281
msgid "Properties"
msgstr "属性"
-#: tvp-svn-helper/main.c:302
+#: ../tvp-svn-helper/main.c:305
msgid "Resolved Related Options:"
msgstr "Resolved 操作相关选项:"
-#: tvp-svn-helper/main.c:306
+#: ../tvp-svn-helper/main.c:309
msgid "Relocate Related Options:"
msgstr "Relocate 操作相关选项:"
-#: tvp-svn-helper/main.c:310
+#: ../tvp-svn-helper/main.c:313
msgid "Revert Related Options:"
msgstr "Revert 操作相关选项:"
-#: tvp-svn-helper/main.c:314 tvp-git-helper/main.c:110
-msgid "Status Related Options:"
-msgstr "Status 操作相关选项:"
-
-#: tvp-svn-helper/main.c:318
+#: ../tvp-svn-helper/main.c:321
msgid "Switch Related Options:"
msgstr "Switch 操作相关选项:"
-#: tvp-svn-helper/main.c:322
+#: ../tvp-svn-helper/main.c:325
msgid "Unlock Related Options:"
msgstr "Unlock 操作相关选项:"
-#: tvp-svn-helper/main.c:326
+#: ../tvp-svn-helper/main.c:329
msgid "Update Related Options:"
msgstr "Update 操作相关选项:"
-#: tvp-svn-helper/main.c:369
+#: ../tvp-svn-helper/main.c:372
msgid "Not enough arguments provided"
msgstr "参数不足"
-#: tvp-svn-helper/tsh-add.c:73 tvp-svn-helper/tsh-add.c:89
-#: tvp-svn-helper/tsh-checkout.c:71 tvp-svn-helper/tsh-commit.c:91
-#: tvp-svn-helper/tsh-copy.c:87 tvp-svn-helper/tsh-delete.c:91
-#: tvp-svn-helper/tsh-export.c:72 tvp-svn-helper/tsh-import.c:72
-#: tvp-svn-helper/tsh-lock.c:91 tvp-svn-helper/tsh-move.c:77
-#: tvp-svn-helper/tsh-resolved.c:73 tvp-svn-helper/tsh-resolved.c:89
-#: tvp-svn-helper/tsh-revert.c:87 tvp-svn-helper/tsh-switch.c:71
-#: tvp-svn-helper/tsh-unlock.c:86 tvp-svn-helper/tsh-update.c:88
-msgid "Failed"
-msgstr "失败"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:94
-msgid "Line"
-msgstr "行"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:100 tvp-svn-helper/tsh-log-dialog.c:118
-msgid "Revision"
-msgstr "修订版本"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:106 tvp-svn-helper/tsh-log-dialog.c:124
-msgid "Author"
-msgstr "作者"
-
-#: tvp-svn-helper/tsh-blame-dialog.c:112 tvp-svn-helper/tsh-log-dialog.c:130
-msgid "Date"
-msgstr "日期"
-
-#: tvp-svn-helper/tsh-blame.c:75
+#: ../tvp-svn-helper/tsh-blame.c:75
msgid "Blame failed"
msgstr "Blame 操作失败"
-#: tvp-svn-helper/tsh-cleanup.c:66
+#: ../tvp-svn-helper/tsh-cleanup.c:66
msgid "Cleanup failed"
msgstr "Cleanup 操作失败"
-#: tvp-svn-helper/tsh-cleanup.c:81
+#: ../tvp-svn-helper/tsh-cleanup.c:81
msgid "Cleanup finished"
msgstr "Cleanup 操作完成"
-#: tvp-svn-helper/tsh-cleanup.c:95
+#: ../tvp-svn-helper/tsh-cleanup.c:95
msgid "Cleaning up ..."
msgstr "正在进行 cleanup 操作..."
-#: tvp-svn-helper/tsh-commit.c:103 tvp-svn-helper/tsh-common.c:719
-#: tvp-svn-helper/tsh-copy.c:99 tvp-svn-helper/tsh-delete.c:103
-#: tvp-svn-helper/tsh-import.c:82 tvp-svn-helper/tsh-move.c:89
+#: ../tvp-svn-helper/tsh-commit.c:196 ../tvp-svn-helper/tsh-common.c:742
+#: ../tvp-svn-helper/tsh-copy.c:99 ../tvp-svn-helper/tsh-delete.c:103
+#: ../tvp-svn-helper/tsh-import.c:82 ../tvp-svn-helper/tsh-move.c:89
#, c-format
msgid "At revision: %ld"
msgstr "在修订版本: %ld"
-#: tvp-svn-helper/tsh-commit.c:108
+#: ../tvp-svn-helper/tsh-commit.c:201
msgid "Nothing to do"
msgstr "没有任何事情做"
-#: tvp-svn-helper/tsh-commit.c:114 tvp-svn-helper/tsh-common.c:505
-#: tvp-svn-helper/tsh-common.c:507 tvp-svn-helper/tsh-copy.c:110
-#: tvp-svn-helper/tsh-delete.c:114 tvp-svn-helper/tsh-import.c:87
-#: tvp-svn-helper/tsh-move.c:100
+#: ../tvp-svn-helper/tsh-commit.c:209 ../tvp-svn-helper/tsh-common.c:526
+#: ../tvp-svn-helper/tsh-common.c:528 ../tvp-svn-helper/tsh-copy.c:110
+#: ../tvp-svn-helper/tsh-delete.c:114 ../tvp-svn-helper/tsh-import.c:87
+#: ../tvp-svn-helper/tsh-move.c:100
msgid "Completed"
msgstr "完成"
-#: tvp-svn-helper/tsh-commit.c:145
+#: ../tvp-svn-helper/tsh-commit.c:241
msgid "Commit Message"
msgstr "Commit 消息"
-#: tvp-svn-helper/tsh-common.c:270
+#: ../tvp-svn-helper/tsh-common.c:271
msgid "Store password a plaintext?"
msgstr "以文本方式保存密码？"
-#: tvp-svn-helper/tsh-common.c:494 tvp-svn-helper/tsh-common.c:503
-#: tvp-svn-helper/tsh-common.c:510 tvp-svn-helper/tsh-common.c:632
-#: tvp-svn-helper/tsh-common.c:677 tvp-svn-helper/tsh-common.c:768
+#: ../tvp-svn-helper/tsh-common.c:515 ../tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:531 ../tvp-svn-helper/tsh-common.c:653
+#: ../tvp-svn-helper/tsh-common.c:700 ../tvp-svn-helper/tsh-common.c:791
msgid "Added"
msgstr "已添加"
-#: tvp-svn-helper/tsh-common.c:495 tvp-svn-helper/tsh-common.c:777
+#: ../tvp-svn-helper/tsh-common.c:516 ../tvp-svn-helper/tsh-common.c:800
msgid "Copied"
msgstr "已复制"
-#: tvp-svn-helper/tsh-common.c:496 tvp-svn-helper/tsh-common.c:502
-#: tvp-svn-helper/tsh-common.c:511 tvp-svn-helper/tsh-common.c:634
-#: tvp-svn-helper/tsh-common.c:680 tvp-svn-helper/tsh-common.c:770
+#: ../tvp-svn-helper/tsh-common.c:517 ../tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:532 ../tvp-svn-helper/tsh-common.c:655
+#: ../tvp-svn-helper/tsh-common.c:703 ../tvp-svn-helper/tsh-common.c:793
msgid "Deleted"
msgstr "已删除"
-#: tvp-svn-helper/tsh-common.c:497
+#: ../tvp-svn-helper/tsh-common.c:518
msgid "Restored"
msgstr "已恢复"
-#: tvp-svn-helper/tsh-common.c:498
+#: ../tvp-svn-helper/tsh-common.c:519
msgid "Reverted"
msgstr "已回溯"
-#: tvp-svn-helper/tsh-common.c:499
+#: ../tvp-svn-helper/tsh-common.c:520
msgid "Revert failed"
msgstr "Revert 操作失败"
-#: tvp-svn-helper/tsh-common.c:501
+#: ../tvp-svn-helper/tsh-common.c:522
msgid "Skipped"
msgstr "跳过"
-#: tvp-svn-helper/tsh-common.c:504
+#: ../tvp-svn-helper/tsh-common.c:525
msgid "Updated"
msgstr "已更新"
-#: tvp-svn-helper/tsh-common.c:506 tvp-svn-helper/tsh-common.c:508
-#: tvp-svn-helper/tsh-common.c:641
+#: ../tvp-svn-helper/tsh-common.c:527 ../tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:662
msgid "External"
msgstr "外部"
-#: tvp-svn-helper/tsh-common.c:509 tvp-svn-helper/tsh-common.c:636
-#: tvp-svn-helper/tsh-common.c:683 tvp-svn-helper/tsh-common.c:773
+#: ../tvp-svn-helper/tsh-common.c:530 ../tvp-svn-helper/tsh-common.c:657
+#: ../tvp-svn-helper/tsh-common.c:706 ../tvp-svn-helper/tsh-common.c:796
msgid "Modified"
msgstr "已修改"
-#: tvp-svn-helper/tsh-common.c:512 tvp-svn-helper/tsh-common.c:635
-#: tvp-svn-helper/tsh-common.c:686 tvp-svn-helper/tsh-common.c:766
+#: ../tvp-svn-helper/tsh-common.c:533 ../tvp-svn-helper/tsh-common.c:656
+#: ../tvp-svn-helper/tsh-common.c:709 ../tvp-svn-helper/tsh-common.c:789
msgid "Replaced"
msgstr "已替换"
-#: tvp-svn-helper/tsh-common.c:513
+#: ../tvp-svn-helper/tsh-common.c:534
msgid "Transmitting"
msgstr "正在传送"
-#: tvp-svn-helper/tsh-common.c:515
+#: ../tvp-svn-helper/tsh-common.c:536
msgid "Locked"
msgstr "已上锁"
-#: tvp-svn-helper/tsh-common.c:516 tvp-svn-helper/tsh-common.c:779
+#: ../tvp-svn-helper/tsh-common.c:537 ../tvp-svn-helper/tsh-common.c:802
msgid "Unlocked"
msgstr "已解锁"
-#: tvp-svn-helper/tsh-common.c:517
+#: ../tvp-svn-helper/tsh-common.c:538
msgid "Lock failed"
msgstr "Lock 操作失败"
-#: tvp-svn-helper/tsh-common.c:518
+#: ../tvp-svn-helper/tsh-common.c:539
msgid "Unlock failed"
msgstr "Unlock 操作失败"
-#: tvp-svn-helper/tsh-common.c:519
+#: ../tvp-svn-helper/tsh-common.c:540
msgid "Exists"
msgstr "存在"
-#: tvp-svn-helper/tsh-common.c:520
+#: ../tvp-svn-helper/tsh-common.c:541
msgid "Changelist set"
msgstr "更新列表设置"
-#: tvp-svn-helper/tsh-common.c:521
+#: ../tvp-svn-helper/tsh-common.c:542
msgid "Changelist cleared"
msgstr "更新列表已清空"
-#: tvp-svn-helper/tsh-common.c:522
+#: ../tvp-svn-helper/tsh-common.c:543
msgid "Changelist moved"
msgstr "更新列表已移动"
-#: tvp-svn-helper/tsh-common.c:523
+#: ../tvp-svn-helper/tsh-common.c:544
msgid "Merge begin"
msgstr "合并开始"
-#: tvp-svn-helper/tsh-common.c:524
+#: ../tvp-svn-helper/tsh-common.c:545
msgid "Foreign merge begin"
msgstr "外部合并开始"
-#: tvp-svn-helper/tsh-common.c:525
+#: ../tvp-svn-helper/tsh-common.c:546
msgid "Replace"
msgstr "替换"
-#: tvp-svn-helper/tsh-common.c:527
+#: ../tvp-svn-helper/tsh-common.c:548
msgid "Property added"
msgstr "属性已添加"
-#: tvp-svn-helper/tsh-common.c:528
+#: ../tvp-svn-helper/tsh-common.c:549
msgid "Property modified"
msgstr "属性已修改"
-#: tvp-svn-helper/tsh-common.c:529
+#: ../tvp-svn-helper/tsh-common.c:550
msgid "Property deleted"
msgstr "属性已删除"
-#: tvp-svn-helper/tsh-common.c:530
+#: ../tvp-svn-helper/tsh-common.c:551
msgid "Property nonexisting"
msgstr "不存在该属性"
-#: tvp-svn-helper/tsh-common.c:531
+#: ../tvp-svn-helper/tsh-common.c:552
msgid "Revision property set"
msgstr "修订版本属性设置"
-#: tvp-svn-helper/tsh-common.c:532
+#: ../tvp-svn-helper/tsh-common.c:553
msgid "Revision property deleted"
msgstr "修订版本属性已删除"
-#: tvp-svn-helper/tsh-common.c:533
+#: ../tvp-svn-helper/tsh-common.c:554
msgid "Merge completed"
msgstr "合并完毕"
-#: tvp-svn-helper/tsh-common.c:534
+#: ../tvp-svn-helper/tsh-common.c:555
msgid "Tree conflict"
msgstr "树冲突"
-#: tvp-svn-helper/tsh-common.c:535
+#: ../tvp-svn-helper/tsh-common.c:556
msgid "External failed"
msgstr "External 操作失败"
-#: tvp-svn-helper/tsh-common.c:596
+#: ../tvp-svn-helper/tsh-common.c:617
msgid "Inapplicable"
msgstr "不适用"
-#: tvp-svn-helper/tsh-common.c:598
+#: ../tvp-svn-helper/tsh-common.c:619
msgid "Unchanged"
msgstr "未被改变"
-#: tvp-svn-helper/tsh-common.c:599 tvp-svn-helper/tsh-common.c:633
+#: ../tvp-svn-helper/tsh-common.c:620 ../tvp-svn-helper/tsh-common.c:654
msgid "Missing"
msgstr "缺失"
-#: tvp-svn-helper/tsh-common.c:600 tvp-svn-helper/tsh-common.c:640
+#: ../tvp-svn-helper/tsh-common.c:621 ../tvp-svn-helper/tsh-common.c:661
msgid "Obstructed"
msgstr "受阻"
-#: tvp-svn-helper/tsh-common.c:601
+#: ../tvp-svn-helper/tsh-common.c:622
msgid "Changed"
msgstr "已被改变"
-#: tvp-svn-helper/tsh-common.c:602 tvp-svn-helper/tsh-common.c:637
+#: ../tvp-svn-helper/tsh-common.c:623 ../tvp-svn-helper/tsh-common.c:658
msgid "Merged"
msgstr "已被合并"
-#: tvp-svn-helper/tsh-common.c:603 tvp-svn-helper/tsh-common.c:638
+#: ../tvp-svn-helper/tsh-common.c:624 ../tvp-svn-helper/tsh-common.c:659
msgid "Conflicted"
msgstr "存在冲突"
#. N_("None"),
#. N_("Unversioned"),
-#: tvp-svn-helper/tsh-common.c:631
+#: ../tvp-svn-helper/tsh-common.c:652
msgid "Normal"
msgstr "一般"
-#: tvp-svn-helper/tsh-common.c:639
+#: ../tvp-svn-helper/tsh-common.c:660
msgid "Ignored"
msgstr "已被忽略"
-#: tvp-svn-helper/tsh-common.c:642
+#: ../tvp-svn-helper/tsh-common.c:663
msgid "Incomplete"
msgstr "未完成"
-#: tvp-svn-helper/tsh-copy.c:104
+#: ../tvp-svn-helper/tsh-copy.c:104
msgid "Local copy"
msgstr "在本地复制"
-#: tvp-svn-helper/tsh-copy.c:147
+#: ../tvp-svn-helper/tsh-copy.c:148
msgid "Copy To"
msgstr "复制到"
-#: tvp-svn-helper/tsh-delete.c:108
+#: ../tvp-svn-helper/tsh-delete.c:108
msgid "Local delete"
msgstr "在本地删除"
-#: tvp-svn-helper/tsh-delete.c:145
+#: ../tvp-svn-helper/tsh-delete.c:145
msgid "Delete Message"
msgstr "删除信息"
-#: tvp-svn-helper/tsh-file-dialog.c:60
+#: ../tvp-svn-helper/tsh-file-dialog.c:60
msgid "_Certificate:"
msgstr "证书(_C):"
-#: tvp-svn-helper/tsh-file-dialog.c:67
+#: ../tvp-svn-helper/tsh-file-dialog.c:67
msgid "Select a file"
msgstr "选择一个文件"
-#: tvp-svn-helper/tsh-file-dialog.c:78 tvp-svn-helper/tsh-login-dialog.c:98
-#: tvp-svn-helper/tsh-trust-dialog.c:73
+#: ../tvp-svn-helper/tsh-file-dialog.c:78
+#: ../tvp-svn-helper/tsh-login-dialog.c:98
+#: ../tvp-svn-helper/tsh-trust-dialog.c:73
msgid "Remember"
msgstr "记住"
-#: tvp-svn-helper/tsh-file-dialog.c:86
+#: ../tvp-svn-helper/tsh-file-dialog.c:86
msgid "Certificate"
msgstr "证书"
-#: tvp-svn-helper/tsh-file-selection-dialog.c:91
-#: tvp-svn-helper/tsh-log-message-dialog.c:92
-#: tvp-svn-helper/tsh-notify-dialog.c:94
-#: tvp-svn-helper/tsh-status-dialog.c:116
-#: tvp-git-helper/tgh-branch-dialog.c:104
-#: tvp-git-helper/tgh-file-selection-dialog.c:92
-#: tvp-git-helper/tgh-reset-dialog.c:87 tvp-git-helper/tgh-status-dialog.c:104
-msgid "Path"
-msgstr "路径"
-
-#: tvp-svn-helper/tsh-file-selection-dialog.c:118
-#: tvp-git-helper/tgh-file-selection-dialog.c:113
-msgid "Select/Unselect all"
-msgstr "全选/全不选"
-
-#: tvp-svn-helper/tsh-import.c:125
+#: ../tvp-svn-helper/tsh-import.c:125
msgid "Import Message"
msgstr "Import 信息"
-#: tvp-svn-helper/tsh-log-dialog.c:136
-msgid "Message"
-msgstr "信息"
-
-#: tvp-svn-helper/tsh-log-dialog.c:174 tvp-svn-helper/tsh-notify-dialog.c:88
-msgid "Action"
-msgstr "操作"
-
-#: tvp-svn-helper/tsh-log-dialog.c:180
-msgid "File"
-msgstr "文件"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:86
-msgid "State"
-msgstr "状态"
-
-#: tvp-svn-helper/tsh-log-message-dialog.c:110
-msgid "Log Message"
-msgstr "Log 信息"
-
-#: tvp-svn-helper/tsh-log.c:106
+#: ../tvp-svn-helper/tsh-log.c:113
msgid "Log failed"
msgstr "Log 操作失败"
-#: tvp-svn-helper/tsh-login-dialog.c:65
+#: ../tvp-svn-helper/tsh-login-dialog.c:65
msgid "_Username:"
msgstr "用户名(_U):"
-#: tvp-svn-helper/tsh-login-dialog.c:81
+#: ../tvp-svn-helper/tsh-login-dialog.c:81
msgid "_Password:"
msgstr "密码(_P):"
-#: tvp-svn-helper/tsh-login-dialog.c:106
+#: ../tvp-svn-helper/tsh-login-dialog.c:106
msgid "Login"
msgstr "登录"
-#: tvp-svn-helper/tsh-move.c:94
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:93
+msgid "State"
+msgstr "状态"
+
+#: ../tvp-svn-helper/tsh-log-message-dialog.c:118
+msgid "Log Message"
+msgstr "Log 信息"
+
+#: ../tvp-svn-helper/tsh-move.c:94
msgid "Local move"
msgstr "本地移动"
-#: tvp-svn-helper/tsh-move.c:136
-msgid "Move To"
-msgstr "移动到"
-
-#: tvp-svn-helper/tsh-notify-dialog.c:100
+#: ../tvp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime 类型"
-#: tvp-svn-helper/tsh-notify-dialog.c:115
+#: ../tvp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "通知"
-#: tvp-svn-helper/tsh-properties-dialog.c:126
-msgid "Name"
-msgstr "名称"
+#. tsh_properties_dialog_done (dialog);
+#: ../tvp-svn-helper/tsh-properties.c:81
+msgid "Set property failed"
+msgstr "设置属性失败"
+
+#: ../tvp-svn-helper/tsh-properties.c:104
+msgid "Properties failed"
+msgstr "Prop 操作失败"
-#: tvp-svn-helper/tsh-properties-dialog.c:132
+#: ../tvp-svn-helper/tsh-properties-dialog.c:132
msgid "Value"
msgstr "值"
@@ -887,8 +1267,8 @@ msgstr "值"
#. Translators: svn recursion selection
#. * Self means only this file/direcotry is shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:209
-#: tvp-svn-helper/tsh-status-dialog.c:182
+#: ../tvp-svn-helper/tsh-properties-dialog.c:207
+#: ../tvp-svn-helper/tsh-status-dialog.c:182
msgid "Self"
msgstr "自身 (只 显示/更新 此 文件/目录)"
@@ -898,8 +1278,8 @@ msgstr "自身 (只 显示/更新 此 文件/目录)"
#. Translators: svn recursion selection
#. * Immediate files means this file/direcotry and the files it contains are shown
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:220
-#: tvp-svn-helper/tsh-status-dialog.c:191
+#: ../tvp-svn-helper/tsh-properties-dialog.c:218
+#: ../tvp-svn-helper/tsh-status-dialog.c:191
msgid "Immediate files"
msgstr "立即 文件 (显示/更新 当前文件或者当前文件夹中的文件)"
@@ -909,152 +1289,87 @@ msgstr "立即 文件 (显示/更新 当前文件或者当前文件夹中的文
#. Translators: svn recursion selection
#. * Recursive means the list is full recursive
#.
-#: tvp-svn-helper/tsh-properties-dialog.c:238
-#: tvp-svn-helper/tsh-status-dialog.c:209
+#: ../tvp-svn-helper/tsh-properties-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:209
msgid "Recursive"
msgstr "递归 (递归 显示/更新 当前文件或者当前文件夹及其子文件夹中的内容)"
-#. tsh_properties_dialog_done (dialog);
-#: tvp-svn-helper/tsh-properties.c:81
-msgid "Set property failed"
-msgstr "设置属性失败"
-
-#: tvp-svn-helper/tsh-properties.c:104
-msgid "Properties failed"
-msgstr "Prop 操作失败"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:88
-msgid "_From:"
-msgstr "从(_F):"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:98
-#: tvp-svn-helper/tsh-relocate-dialog.c:104
-#: tvp-svn-helper/tsh-relocate-dialog.c:153
-#: tvp-svn-helper/tsh-relocate-dialog.c:159
-#: tvp-svn-helper/tsh-relocate-dialog.c:205
-#: tvp-svn-helper/tsh-transfer-dialog.c:92
-#: tvp-svn-helper/tsh-transfer-dialog.c:98
-#: tvp-svn-helper/tsh-transfer-dialog.c:144
-msgid "Select a folder"
-msgstr "选择一个文件夹"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:143
-msgid "_To:"
-msgstr "至(_T):"
-
-#: tvp-svn-helper/tsh-relocate-dialog.c:198
-#: tvp-svn-helper/tsh-transfer-dialog.c:137
-msgid "_Directory:"
-msgstr "目录(_D):"
-
-#: tvp-svn-helper/tsh-relocate.c:71
+#: ../tvp-svn-helper/tsh-relocate.c:71
msgid "Relocate failed"
msgstr "Relocate 操作失败"
-#: tvp-svn-helper/tsh-relocate.c:86
+#: ../tvp-svn-helper/tsh-relocate.c:86
msgid "Relocate finished"
msgstr "Relocate 操作完成"
-#: tvp-svn-helper/tsh-relocate.c:128
+#: ../tvp-svn-helper/tsh-relocate.c:128
msgid "Relocating ..."
msgstr "正在执行 relocate 操作..."
-#: tvp-svn-helper/tsh-status-dialog.c:224
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:88
+msgid "_From:"
+msgstr "从(_F):"
+
+#: ../tvp-svn-helper/tsh-relocate-dialog.c:143
+msgid "_To:"
+msgstr "至(_T):"
+
+#: ../tvp-svn-helper/tsh-status.c:86
+msgid "Status failed"
+msgstr "Status 操作失败"
+
+#: ../tvp-svn-helper/tsh-status-dialog.c:224
msgid "Show Unmodified Files"
msgstr "显示未被修改的文件"
-#: tvp-svn-helper/tsh-status-dialog.c:228
+#: ../tvp-svn-helper/tsh-status-dialog.c:228
msgid "Show Unversioned Files"
msgstr "显示未被加入版本控制的文件"
-#: tvp-svn-helper/tsh-status-dialog.c:232
+#: ../tvp-svn-helper/tsh-status-dialog.c:232
msgid "Show Ignored Files"
msgstr "显示被忽略的文件"
-#: tvp-svn-helper/tsh-status-dialog.c:236
+#: ../tvp-svn-helper/tsh-status-dialog.c:236
msgid "Hide Externals"
msgstr "隐藏外部内容"
-#: tvp-svn-helper/tsh-status-dialog.c:240
+#: ../tvp-svn-helper/tsh-status-dialog.c:240
msgid "Check Repository"
msgstr "检查仓库"
-#: tvp-svn-helper/tsh-status.c:86 tvp-git-helper/tgh-common.c:48
-msgid "Status failed"
-msgstr "Status 操作失败"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:82
-msgid "_Repository:"
-msgstr "仓库(_R):"
-
-#: tvp-svn-helper/tsh-transfer-dialog.c:156
-msgid "Transfer"
-msgstr "传输"
-
-#: tvp-svn-helper/tsh-trust-dialog.c:58
+#: ../tvp-svn-helper/tsh-trust-dialog.c:58
msgid "Certificate is not yet valid."
msgstr "证书无效。"
-#: tvp-svn-helper/tsh-trust-dialog.c:61
+#: ../tvp-svn-helper/tsh-trust-dialog.c:61
msgid "Certificate has expired."
msgstr "证书过期。"
-#: tvp-svn-helper/tsh-trust-dialog.c:64
+#: ../tvp-svn-helper/tsh-trust-dialog.c:64
msgid "Certificate does not match the remote hostname."
msgstr "证书与远程服务器名称不符。"
-#: tvp-svn-helper/tsh-trust-dialog.c:67
+#: ../tvp-svn-helper/tsh-trust-dialog.c:67
msgid "Certificate authority is unknown."
msgstr "证书发布者未知。"
-#: tvp-svn-helper/tsh-trust-dialog.c:70
+#: ../tvp-svn-helper/tsh-trust-dialog.c:70
msgid "Other failure."
msgstr "其他失败。"
-#: tvp-svn-helper/tsh-trust-dialog.c:77
+#: ../tvp-svn-helper/tsh-trust-dialog.c:77
msgid "Trust"
msgstr "信任"
-#: tvp-git-helper/main.c:77
#, fuzzy
-msgid "Execute branch action"
-msgstr "执行 blame 操作"
+#~ msgid "Execute remove action"
+#~ msgstr "执行 move 操作"
-#: tvp-git-helper/main.c:83
#, fuzzy
-msgid "Execute reset action"
-msgstr "执行 revert 操作"
-
-#: tvp-git-helper/main.c:102
-#, fuzzy
-msgid "Branch Related Options:"
-msgstr "Blame 操作相关选项:"
-
-#: tvp-git-helper/main.c:102 tvp-git-helper/tgh-branch-dialog.c:119
-msgid "Branch"
-msgstr ""
+#~ msgid "Remove Related Options:"
+#~ msgstr "Resolved 操作相关选项:"
-#: tvp-git-helper/main.c:106
#, fuzzy
-msgid "Reset Related Options:"
-msgstr "Revert 操作相关选项:"
-
-#: tvp-git-helper/main.c:106 tvp-git-helper/tgh-reset-dialog.c:108
-#: tvp-git-helper/tgh-reset.c:125
-#, fuzzy
-msgid "Reset"
-msgstr "Revert"
-
-#: tvp-git-helper/tgh-add.c:58
-#, fuzzy
-msgid "Add finished"
-msgstr "Cleanup 操作完成"
-
-#: tvp-git-helper/tgh-add.c:126
-msgid "Adding ..."
-msgstr ""
-
-#: tvp-git-helper/tgh-common.c:123
-#: tvp-git-helper/tgh-file-selection-dialog.c:267
-msgid "untracked"
-msgstr ""
+#~ msgid "Add finished"
+#~ msgstr "Cleanup 操作完成"
diff --git a/thunar-vcs-plugin/Makefile.am b/thunar-vcs-plugin/Makefile.am
index 95d5f2e..d8b3a3c 100644
--- a/thunar-vcs-plugin/Makefile.am
+++ b/thunar-vcs-plugin/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"thunar-vcs-plugin\" \
@@ -31,6 +31,17 @@ thunar_vcs_plugin_la_SOURCES += \
tvp-git-action.h
endif
+thunar_vcs_plugin_la_CPPFLAGS = \
+ $(AM_CPPFLAGS)
+if HAVE_SUBVERSION
+thunar_vcs_plugin_la_CPPFLAGS += \
+ -DTVP_SVN_HELPER=\"$(libexecdir)/tvp-svn-helper\"
+endif
+if HAVE_GIT
+thunar_vcs_plugin_la_CPPFLAGS += \
+ -DTVP_GIT_HELPER=\"$(libexecdir)/tvp-git-helper\"
+endif
+
thunar_vcs_plugin_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(THUNARX_CFLAGS) \
@@ -38,12 +49,7 @@ thunar_vcs_plugin_la_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS)
if HAVE_SUBVERSION
thunar_vcs_plugin_la_CFLAGS += \
- $(APR_CFLAGS) \
- -DTVP_SVN_HELPER=\"$(libexecdir)/tvp-svn-helper\"
-endif
-if HAVE_GIT
-thunar_vcs_plugin_la_CFLAGS += \
- -DTVP_GIT_HELPER=\"$(libexecdir)/tvp-git-helper\"
+ $(APR_CFLAGS)
endif
thunar_vcs_plugin_la_LDFLAGS = \
diff --git a/thunar-vcs-plugin/thunar-vcs-plugin.c b/thunar-vcs-plugin/thunar-vcs-plugin.c
index 2daa7df..8cdce62 100644
--- a/thunar-vcs-plugin/thunar-vcs-plugin.c
+++ b/thunar-vcs-plugin/thunar-vcs-plugin.c
@@ -40,6 +40,9 @@ static GType type_list[1];
+/* delcare it here to make the compiler happy */
+G_MODULE_EXPORT void thunar_extension_initialize (ThunarxProviderPlugin *plugin);
+
G_MODULE_EXPORT void
thunar_extension_initialize (ThunarxProviderPlugin *plugin)
{
@@ -79,6 +82,9 @@ thunar_extension_initialize (ThunarxProviderPlugin *plugin)
+/* delcare it here to make the compiler happy */
+G_MODULE_EXPORT void thunar_extension_shutdown (void);
+
G_MODULE_EXPORT void
thunar_extension_shutdown (void)
{
@@ -89,6 +95,9 @@ thunar_extension_shutdown (void)
+/* delcare it here to make the compiler happy */
+G_MODULE_EXPORT void thunar_extension_list_types (const GType **types, gint *n_types);
+
G_MODULE_EXPORT void
thunar_extension_list_types (const GType **types,
gint *n_types)
@@ -97,5 +106,3 @@ thunar_extension_list_types (const GType **types,
*n_types = G_N_ELEMENTS (type_list);
}
-
-
diff --git a/thunar-vcs-plugin/tvp-git-action.c b/thunar-vcs-plugin/tvp-git-action.c
index f7a98ef..ac0c181 100644
--- a/thunar-vcs-plugin/tvp-git-action.c
+++ b/thunar-vcs-plugin/tvp-git-action.c
@@ -55,6 +55,8 @@ struct _TvpGitAction
struct {
unsigned is_parent : 1;
+ unsigned is_directory : 1;
+ unsigned is_file : 1;
} property;
GList *files;
@@ -65,6 +67,8 @@ struct _TvpGitAction
enum {
PROPERTY_IS_PARENT = 1,
+ PROPERTY_IS_DIRECTORY,
+ PROPERTY_IS_FILE
};
@@ -116,6 +120,12 @@ tvp_git_action_class_init (TvpGitActionClass *klass)
g_object_class_install_property (gobject_class, PROPERTY_IS_PARENT,
g_param_spec_boolean ("is-parent", "", "", FALSE, G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+ g_object_class_install_property (gobject_class, PROPERTY_IS_DIRECTORY,
+ g_param_spec_boolean ("is-directory", "", "", FALSE, G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+ g_object_class_install_property (gobject_class, PROPERTY_IS_FILE,
+ g_param_spec_boolean ("is-file", "", "", FALSE, G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
action_signal[SIGNAL_NEW_PROCESS] = g_signal_new("new-process", G_OBJECT_CLASS_TYPE(gobject_class), G_SIGNAL_RUN_FIRST,
0, NULL, NULL, tsh_cclosure_marshal_VOID__POINTER_STRING, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_STRING);
@@ -139,16 +149,22 @@ tvp_git_action_new (const gchar *name,
const gchar *label,
GList *files,
GtkWidget *window,
- gboolean is_parent)
+ gboolean is_parent,
+ gboolean is_direcotry,
+ gboolean is_file)
{
+ GtkAction *action;
+
g_return_val_if_fail(name, NULL);
g_return_val_if_fail(label, NULL);
- GtkAction *action = g_object_new (TVP_TYPE_GIT_ACTION,
+ action = g_object_new (TVP_TYPE_GIT_ACTION,
"hide-if-empty", FALSE,
"name", name,
"label", label,
"is-parent", is_parent,
+ "is-directory", is_direcotry,
+ "is-file", is_file,
#if !GTK_CHECK_VERSION(2,9,0)
"stock-id", "git",
#else
@@ -184,6 +200,12 @@ tvp_git_action_set_property (GObject *object, guint property_id, const GValue *v
case PROPERTY_IS_PARENT:
TVP_GIT_ACTION (object)->property.is_parent = g_value_get_boolean (value)?1:0;
break;
+ case PROPERTY_IS_DIRECTORY:
+ TVP_GIT_ACTION (object)->property.is_directory = g_value_get_boolean (value)?1:0;
+ break;
+ case PROPERTY_IS_FILE:
+ TVP_GIT_ACTION (object)->property.is_file = g_value_get_boolean (value)?1:0;
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@@ -221,8 +243,9 @@ add_subaction_u (GtkMenuShell *menu, const gchar *name, const gchar *text, const
subitem = gtk_action_create_menu_item (subaction);
g_object_get (G_OBJECT (subaction), "tooltip", &tooltip, NULL);
gtk_widget_set_tooltip_text(subitem, tooltip);
- gtk_menu_shell_append (menu, subitem);
- gtk_widget_show(subitem);
+ //gtk_menu_shell_append (menu, subitem);
+ //gtk_widget_show(subitem);
+ gtk_widget_unref (subitem);
}
@@ -231,6 +254,7 @@ tvp_git_action_create_menu_item (GtkAction *action)
{
GtkWidget *item;
GtkWidget *menu;
+ TvpGitAction *tvp_action = TVP_GIT_ACTION (action);
item = GTK_ACTION_CLASS(tvp_git_action_parent_class)->create_menu_item (action);
@@ -239,23 +263,32 @@ tvp_git_action_create_menu_item (GtkAction *action)
add_subaction (action, GTK_MENU_SHELL(menu), "tvp::add", Q_("Menu|Add"), _("Add"), GTK_STOCK_ADD, "--add");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::bisect", Q_("Menu|Bisect"), _("Bisect"), NULL, _("Bisect"));
+ if (tvp_action->property.is_file)
+ add_subaction (action, GTK_MENU_SHELL (menu), "tvp::blame", Q_("Menu|Blame"), _("Blame"), GTK_STOCK_INDEX, "--blame");
+ if(tvp_action->property.is_parent)
add_subaction (action, GTK_MENU_SHELL(menu), "tvp::branch", Q_("Menu|Branch"), _("Branch"), NULL, "--branch");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::checkout", Q_("Menu|Checkout"), _("Checkout"), GTK_STOCK_CONNECT, _("Checkout"));
- add_subaction_u(GTK_MENU_SHELL(menu), "tvp::clone", Q_("Menu|Clone"), _("Clone"), GTK_STOCK_COPY, _("Clone"));
+ add_subaction (action, GTK_MENU_SHELL(menu), "tvp::clean", Q_("Menu|Clean"), _("Clean"), GTK_STOCK_CLEAR, "--clean");
+ if(tvp_action->property.is_parent)
+ add_subaction (action, GTK_MENU_SHELL(menu), "tvp::clone", Q_("Menu|Clone"), _("Clone"), GTK_STOCK_COPY, "--clone");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::commit", Q_("Menu|Commit"), _("Commit"), GTK_STOCK_APPLY, _("Commit"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::diff", Q_("Menu|Diff"), _("Diff"), GTK_STOCK_FIND_AND_REPLACE, _("Diff"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::fetch", Q_("Menu|Fetch"), _("Fetch"), NULL, _("Fetch"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::grep", Q_("Menu|Grep"), _("Grep"), NULL, _("Grep"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::init", Q_("Menu|Init"), _("Init"), NULL, _("Init"));
- add_subaction_u(GTK_MENU_SHELL(menu), "tvp::log", Q_("Menu|Log"), _("Log"), GTK_STOCK_INDEX, _("Log"));
+ add_subaction (action, GTK_MENU_SHELL(menu), "tvp::log", Q_("Menu|Log"), _("Log"), GTK_STOCK_INDEX, "--log");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::merge", Q_("Menu|Merge"), _("Merge"), NULL, _("Merge"));
- add_subaction_u(GTK_MENU_SHELL(menu), "tvp::move", Q_("Menu|Move"), _("Move"), GTK_STOCK_DND_MULTIPLE, _("Move"));
+ if(!tvp_action->property.is_parent)
+ add_subaction (action, GTK_MENU_SHELL(menu), "tvp::move", Q_("Menu|Move"), _("Move"), GTK_STOCK_DND_MULTIPLE, "--move");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::pull", Q_("Menu|Pull"), _("Pull"), NULL, _("Pull"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::push", Q_("Menu|Push"), _("Push"), NULL, _("Push"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::rebase", Q_("Menu|Rebase"), _("Rebase"), NULL, _("Rebase"));
add_subaction (action, GTK_MENU_SHELL(menu), "tvp::reset", Q_("Menu|Reset"), _("Reset"), GTK_STOCK_UNDO, "--reset");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::remove", Q_("Menu|Remove"), _("Remove"), GTK_STOCK_DELETE, _("Remove"));
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::show", Q_("Menu|Show"), _("Show"), NULL, _("Show"));
+ if(tvp_action->property.is_parent)
+ add_subaction (action, GTK_MENU_SHELL(menu), "tvp::stash", Q_("Menu|Stash"), _("Stash"), GTK_STOCK_SAVE, "--stash");
+ if(tvp_action->property.is_parent)
add_subaction (action, GTK_MENU_SHELL(menu), "tvp::status", Q_("Menu|Status"), _("Status"), GTK_STOCK_DIALOG_INFO, "--status");
add_subaction_u(GTK_MENU_SHELL(menu), "tvp::tag", Q_("Menu|Tag"), _("Tag"), NULL, _("Tag"));
diff --git a/thunar-vcs-plugin/tvp-git-action.h b/thunar-vcs-plugin/tvp-git-action.h
index d6a16ee..a016249 100644
--- a/thunar-vcs-plugin/tvp-git-action.h
+++ b/thunar-vcs-plugin/tvp-git-action.h
@@ -42,6 +42,8 @@ GtkAction *tvp_git_action_new (const gchar*,
const gchar*,
GList *,
GtkWidget *,
+ gboolean,
+ gboolean,
gboolean) G_GNUC_MALLOC G_GNUC_INTERNAL;
G_END_DECLS;
diff --git a/thunar-vcs-plugin/tvp-provider.c b/thunar-vcs-plugin/tvp-provider.c
index 02f5ae8..2119b42 100644
--- a/thunar-vcs-plugin/tvp-provider.c
+++ b/thunar-vcs-plugin/tvp-provider.c
@@ -56,10 +56,8 @@
-static void tvp_provider_class_init (TvpProviderClass *klass);
static void tvp_provider_menu_provider_init (ThunarxMenuProviderIface *iface);
static void tvp_provider_property_page_provider_init (ThunarxPropertyPageProviderIface *iface);
-static void tvp_provider_init (TvpProvider *tvp_provider);
static void tvp_provider_finalize (GObject *object);
static GList *tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
GtkWidget *window,
@@ -305,9 +303,13 @@ tvp_get_parent_status (ThunarxFileInfo *file_info)
-gint
+#ifdef HAVE_SUBVERSION
+static gint
tvp_compare_filename (const gchar *uri1, const gchar *uri2)
{
+ gchar *path1, *path2;
+ gint result;
+
/* strip the "file://" part of the uri */
if (strncmp (uri1, "file://", 7) == 0)
{
@@ -320,8 +322,8 @@ tvp_compare_filename (const gchar *uri1, const gchar *uri2)
uri2 += 7;
}
- gchar *path1 = g_strdup (uri1);
- gchar *path2 = g_strdup (uri2);
+ path1 = g_strdup (uri1);
+ path2 = g_strdup (uri2);
/* remove trailing '/' */
if (path1[strlen (path1) - 1] == '/')
@@ -335,13 +337,14 @@ tvp_compare_filename (const gchar *uri1, const gchar *uri2)
path2[strlen (path2) - 1] = '\0';
}
- gint result = strcmp (path1, path2);
+ result = strcmp (path1, path2);
g_free (path1);
g_free (path2);
return result;
}
+#endif
@@ -392,11 +395,15 @@ tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
gboolean directory_is_not_wc = FALSE;
gboolean file_is_vc = FALSE;
gboolean file_is_not_vc = FALSE;
- GList *lp;
- gint n_files = 0;
GSList *file_status;
GSList *iter;
+#endif
+#ifdef HAVE_GIT
+ gboolean directory = FALSE;
+ gboolean file = FALSE;
+#endif
+#ifdef HAVE_SUBVERSION
file_status = tvp_get_parent_status (files->data);
/* check all supplied files */
@@ -459,8 +466,30 @@ tvp_provider_get_file_actions (ThunarxMenuProvider *menu_provider,
#endif
#ifdef HAVE_GIT
+ /* check all supplied files */
+ for (lp = files; lp != NULL; lp = lp->next, ++n_files)
+ {
+ /* check if the file is a local file */
+ info = thunarx_file_info_get_vfs_info (lp->data);
+ scheme = thunar_vfs_path_get_scheme (info->path);
+ thunar_vfs_info_unref (info);
+
+ /* unable to handle non-local files */
+ if (G_UNLIKELY (scheme != THUNAR_VFS_PATH_SCHEME_FILE))
+ return NULL;
+
+ if (thunarx_file_info_is_directory (lp->data))
+ {
+ directory = TRUE;
+ }
+ else
+ {
+ file = TRUE;
+ }
+ }
+
/* append the git submenu action */
- action = tvp_git_action_new ("Tvp::git", _("GIT"), files, window, FALSE);
+ action = tvp_git_action_new ("Tvp::git", _("GIT"), files, window, FALSE, directory, file);
g_signal_connect(action, "new-process", G_CALLBACK(tvp_new_process), menu_provider);
actions = g_list_append (actions, action);
#endif
@@ -502,7 +531,7 @@ tvp_provider_get_folder_actions (ThunarxMenuProvider *menu_provider,
#endif
#ifdef HAVE_GIT
- action = tvp_git_action_new ("Tvp::git", _("GIT"), files, window, TRUE);
+ action = tvp_git_action_new ("Tvp::git", _("GIT"), files, window, TRUE, TRUE, FALSE);
g_signal_connect(action, "new-process", G_CALLBACK(tvp_new_process), menu_provider);
/* append the git submenu action */
actions = g_list_append (actions, action);
@@ -579,12 +608,13 @@ tvp_child_watch (GPid pid, gint status, gpointer data)
{
/*
gchar *watch_path = data;
+ ThunarVfsPath *path;
if (G_LIKELY (data))
{
GDK_THREADS_ENTER ();
- ThunarVfsPath *path = thunar_vfs_path_new (watch_path, NULL);
+ path = thunar_vfs_path_new (watch_path, NULL);
if (G_LIKELY (path))
{
diff --git a/thunar-vcs-plugin/tvp-svn-action.c b/thunar-vcs-plugin/tvp-svn-action.c
index 4425c29..102d5de 100644
--- a/thunar-vcs-plugin/tvp-svn-action.c
+++ b/thunar-vcs-plugin/tvp-svn-action.c
@@ -176,10 +176,12 @@ tvp_svn_action_new (const gchar *name,
gboolean file_version_control,
gboolean file_no_version_control)
{
+ GtkAction *action;
+
g_return_val_if_fail(name, NULL);
g_return_val_if_fail(label, NULL);
- GtkAction *action = g_object_new (TVP_TYPE_SVN_ACTION,
+ action = g_object_new (TVP_TYPE_SVN_ACTION,
"hide-if-empty", FALSE,
"name", name,
"label", label,
@@ -276,8 +278,9 @@ add_subaction_u (GtkMenuShell *menu, const gchar *name, const gchar *text, const
subitem = gtk_action_create_menu_item (subaction);
g_object_get (G_OBJECT (subaction), "tooltip", &tooltip, NULL);
gtk_widget_set_tooltip_text(subitem, tooltip);
- gtk_menu_shell_append (menu, subitem);
- gtk_widget_show(subitem);
+ //gtk_menu_shell_append (menu, subitem);
+ //gtk_widget_show(subitem);
+ gtk_widget_unref (subitem);
}
diff --git a/thunar-vcs-plugin/tvp-svn-backend.c b/thunar-vcs-plugin/tvp-svn-backend.c
index 5605b0d..a7c07d9 100644
--- a/thunar-vcs-plugin/tvp-svn-backend.c
+++ b/thunar-vcs-plugin/tvp-svn-backend.c
@@ -38,13 +38,13 @@ static svn_client_ctx_t *ctx = NULL;
gboolean
-tvp_svn_backend_init ()
+tvp_svn_backend_init (void)
{
+ svn_error_t *err;
+
if (pool)
return TRUE;
- svn_error_t *err;
-
/* Initialize apr */
if (apr_initialize())
return FALSE;
@@ -115,7 +115,7 @@ tvp_svn_backend_init ()
void
-tvp_svn_backend_free ()
+tvp_svn_backend_free (void)
{
if (pool)
{
@@ -133,6 +133,7 @@ tvp_svn_backend_is_working_copy (const gchar *uri)
apr_pool_t *subpool;
svn_error_t *err;
int wc_format;
+ gchar *path;
/* strip the "file://" part of the uri */
if (strncmp (uri, "file://", 7) == 0)
@@ -140,7 +141,7 @@ tvp_svn_backend_is_working_copy (const gchar *uri)
uri += 7;
}
- gchar *path = g_strdup (uri);
+ path = g_strdup (uri);
/* remove trailing '/' cause svn_wc_check_wc can't handle that */
if (path[strlen (path) - 1] == '/')
@@ -199,7 +200,7 @@ status_callback2 (void *baton, const char *path, svn_wc_status2_t *status)
static svn_error_t *
-status_callback3 (void *baton, const char *path, svn_wc_status2_t *status, apr_pool_t *pool)
+status_callback3 (void *baton, const char *path, svn_wc_status2_t *status, apr_pool_t *pool_)
{
status_callback2(baton, path, status);
return SVN_NO_ERROR;
@@ -214,6 +215,7 @@ tvp_svn_backend_get_status (const gchar *uri)
svn_error_t *err;
svn_opt_revision_t revision = {svn_opt_revision_working};
GSList *list = NULL;
+ gchar *path;
/* strip the "file://" part of the uri */
if (strncmp (uri, "file://", 7) == 0)
@@ -221,7 +223,7 @@ tvp_svn_backend_get_status (const gchar *uri)
uri += 7;
}
- gchar *path = g_strdup (uri);
+ path = g_strdup (uri);
/* remove trailing '/' cause svn_client_status2 can't handle that */
if (path[strlen (path) - 1] == '/')
@@ -260,7 +262,7 @@ tvp_svn_backend_get_status (const gchar *uri)
static svn_error_t *
-info_callback (void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool)
+info_callback (void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool_)
{
TvpSvnInfo **pinfo = baton;
g_return_val_if_fail (*pinfo == NULL, SVN_NO_ERROR);
@@ -291,6 +293,7 @@ tvp_svn_backend_get_info (const gchar *uri)
svn_error_t *err;
svn_opt_revision_t revision = {svn_opt_revision_unspecified};
TvpSvnInfo *info = NULL;
+ gchar *path;
/* strip the "file://" part of the uri */
if (strncmp (uri, "file://", 7) == 0)
@@ -298,7 +301,7 @@ tvp_svn_backend_get_info (const gchar *uri)
uri += 7;
}
- gchar *path = g_strdup (uri);
+ path = g_strdup (uri);
/* remove trailing '/' cause svn_client_info can't handle that */
if (path[strlen (path) - 1] == '/')
diff --git a/thunar-vcs-plugin/tvp-svn-backend.h b/thunar-vcs-plugin/tvp-svn-backend.h
index 1526271..6c75d59 100644
--- a/thunar-vcs-plugin/tvp-svn-backend.h
+++ b/thunar-vcs-plugin/tvp-svn-backend.h
@@ -50,8 +50,8 @@ typedef struct
#define TVP_SVN_INFO(p) ((TvpSvnInfo*)p)
-gboolean tvp_svn_backend_init();
-void tvp_svn_backend_free();
+gboolean tvp_svn_backend_init(void);
+void tvp_svn_backend_free(void);
gboolean tvp_svn_backend_is_working_copy (const gchar *uri);
diff --git a/thunar-vcs-plugin/tvp-svn-property-page.c b/thunar-vcs-plugin/tvp-svn-property-page.c
index 9fd9ea5..426d75e 100644
--- a/thunar-vcs-plugin/tvp-svn-property-page.c
+++ b/thunar-vcs-plugin/tvp-svn-property-page.c
@@ -288,7 +288,7 @@ tvp_svn_property_page_get_property (GObject *object, guint property_id, GValue *
-const gchar *
+static const gchar *
depth_to_string(svn_depth_t depth)
{
const gchar *depth_string;
diff --git a/tvp-git-helper/Makefile.am b/tvp-git-helper/Makefile.am
index b825758..95cb37e 100644
--- a/tvp-git-helper/Makefile.am
+++ b/tvp-git-helper/Makefile.am
@@ -16,27 +16,50 @@ tvp_git_helper_SOURCES = \
main.c \
tgh-add.h \
tgh-add.c \
+ tgh-blame.h \
+ tgh-blame.c \
tgh-branch.h \
tgh-branch.c \
+ tgh-clean.h \
+ tgh-clean.c \
+ tgh-clone.h \
+ tgh-clone.c \
tgh-common.h \
tgh-common.c \
+ tgh-log.h \
+ tgh-log.c \
+ tgh-move.h \
+ tgh-move.c \
tgh-reset.h \
tgh-reset.c \
+ tgh-stash.h \
+ tgh-stash.c \
tgh-status.h \
tgh-status.c \
tgh-dialog-common.h \
tgh-dialog-common.c \
+ tgh-blame-dialog.h \
+ tgh-blame-dialog.c \
tgh-branch-dialog.h \
tgh-branch-dialog.c \
+ tgh-clean-dialog.h \
+ tgh-clean-dialog.c \
tgh-file-selection-dialog.h \
tgh-file-selection-dialog.c \
- tgh-reset-dialog.h \
- tgh-reset-dialog.c \
+ tgh-log-dialog.h \
+ tgh-log-dialog.c \
+ tgh-notify-dialog.h \
+ tgh-notify-dialog.c \
+ tgh-stash-dialog.h \
+ tgh-stash-dialog.c \
tgh-status-dialog.h \
- tgh-status-dialog.c
+ tgh-status-dialog.c \
+ tgh-transfer-dialog.h \
+ tgh-transfer-dialog.c
tvp_git_helper_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"tvp-git-helper\"
+ -DG_LOG_DOMAIN=\"tvp-git-helper\" \
+ $(AM_CPPFLAGS)
tvp_git_helper_CFLAGS = \
$(PLATFORM_CFLAGS) \
diff --git a/tvp-git-helper/main.c b/tvp-git-helper/main.c
index 35d8b1f..25e8b02 100644
--- a/tvp-git-helper/main.c
+++ b/tvp-git-helper/main.c
@@ -28,9 +28,17 @@
#include <libxfce4util/libxfce4util.h>
+#include "tgh-common.h"
+
#include "tgh-add.h"
+#include "tgh-blame.h"
#include "tgh-branch.h"
+#include "tgh-clone.h"
+#include "tgh-clean.h"
+#include "tgh-log.h"
+#include "tgh-move.h"
#include "tgh-reset.h"
+#include "tgh-stash.h"
#include "tgh-status.h"
static GPid pid;
@@ -50,8 +58,14 @@ int main (int argc, char *argv[])
/* CMD-line options */
gboolean print_version = FALSE;
gboolean add = FALSE;
+ gboolean blame = FALSE;
gboolean branch = FALSE;
+ gboolean clean = FALSE;
+ gboolean clone = FALSE;
+ gboolean log = FALSE;
+ gboolean move = FALSE;
gboolean reset = FALSE;
+ gboolean stash = FALSE;
gboolean status = FALSE;
gchar **files = NULL;
GError *error = NULL;
@@ -74,22 +88,61 @@ int main (int argc, char *argv[])
GOptionEntry branch_options_table[] =
{
+ { "blame", '\0', 0, G_OPTION_ARG_NONE, &blame, N_("Execute blame action"), NULL },
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
+ GOptionEntry blame_options_table[] =
+ {
{ "branch", '\0', 0, G_OPTION_ARG_NONE, &branch, N_("Execute branch action"), NULL },
{ NULL, '\0', 0, 0, NULL, NULL, NULL }
};
+ GOptionEntry clean_options_table[] =
+ {
+ { "clean", '\0', 0, G_OPTION_ARG_NONE, &clean, N_("Execute clean action"), NULL },
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
+ GOptionEntry clone_options_table[] =
+ {
+ { "clone", '\0', 0, G_OPTION_ARG_NONE, &clone, N_("Execute clone action"), NULL },
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
+ GOptionEntry log_options_table[] =
+ {
+ { "log", '\0', 0, G_OPTION_ARG_NONE, &log, N_("Execute log action"), NULL },
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
+ GOptionEntry move_options_table[] =
+ {
+ { "move", '\0', 0, G_OPTION_ARG_NONE, &move, N_("Execute move action"), NULL },
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
GOptionEntry reset_options_table[] =
{
{ "reset", '\0', 0, G_OPTION_ARG_NONE, &reset, N_("Execute reset action"), NULL },
{ NULL, '\0', 0, 0, NULL, NULL, NULL }
};
+ GOptionEntry stash_options_table[] =
+ {
+ { "stash", '\0', 0, G_OPTION_ARG_NONE, &stash, N_("Execute stash action"), NULL },
+ { NULL, '\0', 0, 0, NULL, NULL, NULL }
+ };
+
GOptionEntry status_options_table[] =
{
{ "status", '\0', 0, G_OPTION_ARG_NONE, &status, N_("Execute status action"), NULL },
{ NULL, '\0', 0, 0, NULL, NULL, NULL }
};
+ /* setup translation domain */
+ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
option_context = g_option_context_new("<action> [options] [args]");
g_option_context_add_main_entries(option_context, general_options_table, GETTEXT_PACKAGE);
@@ -99,14 +152,38 @@ int main (int argc, char *argv[])
g_option_group_add_entries(option_group, add_options_table);
g_option_context_add_group(option_context, option_group);
+ option_group = g_option_group_new("blame", N_("Blame Related Options:"), N_("Blame"), NULL, NULL);
+ g_option_group_add_entries(option_group, blame_options_table);
+ g_option_context_add_group(option_context, option_group);
+
option_group = g_option_group_new("branch", N_("Branch Related Options:"), N_("Branch"), NULL, NULL);
g_option_group_add_entries(option_group, branch_options_table);
g_option_context_add_group(option_context, option_group);
+ option_group = g_option_group_new("clean", N_("Clone Related Options:"), N_("Clean"), NULL, NULL);
+ g_option_group_add_entries(option_group, clean_options_table);
+ g_option_context_add_group(option_context, option_group);
+
+ option_group = g_option_group_new("clone", N_("Clone Related Options:"), N_("Clone"), NULL, NULL);
+ g_option_group_add_entries(option_group, clone_options_table);
+ g_option_context_add_group(option_context, option_group);
+
+ option_group = g_option_group_new("log", N_("Log Related Options:"), N_("Log"), NULL, NULL);
+ g_option_group_add_entries(option_group, log_options_table);
+ g_option_context_add_group(option_context, option_group);
+
+ option_group = g_option_group_new("move", N_("Move Related Options:"), N_("Move"), NULL, NULL);
+ g_option_group_add_entries(option_group, move_options_table);
+ g_option_context_add_group(option_context, option_group);
+
option_group = g_option_group_new("reset", N_("Reset Related Options:"), N_("Reset"), NULL, NULL);
g_option_group_add_entries(option_group, reset_options_table);
g_option_context_add_group(option_context, option_group);
+ option_group = g_option_group_new("stash", N_("Stash Related Options:"), N_("Stash"), NULL, NULL);
+ g_option_group_add_entries(option_group, stash_options_table);
+ g_option_context_add_group(option_context, option_group);
+
option_group = g_option_group_new("status", N_("Status Related Options:"), N_("Status"), NULL, NULL);
g_option_group_add_entries(option_group, status_options_table);
g_option_context_add_group(option_context, option_group);
@@ -128,16 +205,46 @@ int main (int argc, char *argv[])
has_child = tgh_add(files, &pid);
}
+ if(blame)
+ {
+ has_child = tgh_blame(files, &pid);
+ }
+
if(branch)
{
has_child = tgh_branch(files, &pid);
}
+ if(clean)
+ {
+ has_child = tgh_clean(files, &pid);
+ }
+
+ if(clone)
+ {
+ has_child = tgh_clone(files, &pid);
+ }
+
+ if(log)
+ {
+ has_child = tgh_log(files, &pid);
+ }
+
+ if(move)
+ {
+ has_child = tgh_move(files, &pid);
+ }
+
if(reset)
{
has_child = tgh_reset(files, &pid);
}
+ if(stash)
+ {
+ has_child = tgh_stash(files, &pid);
+ }
+
if(status)
{
has_child = tgh_status(files, &pid);
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-add.c
index 78400cc..ab78db2 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-add.c
@@ -22,14 +22,6 @@
#include <stdlib.h>
#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
#include <glib.h>
#include <gtk/gtk.h>
@@ -38,69 +30,49 @@
#include "tgh-common.h"
#include "tgh-dialog-common.h"
#include "tgh-file-selection-dialog.h"
+#include "tgh-notify-dialog.h"
#include "tgh-add.h"
-struct exit_args
-{
- TghOutputParser *parser;
- GtkWidget *dialog;
-};
-
-static void child_exit(GPid pid, gint status, gpointer user_data)
-{
- struct exit_args *args = user_data;
-
- gtk_widget_destroy(args->dialog);
-
- if(WEXITSTATUS(status) <= 1)
- {
- GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Add finished"));
- tgh_dialog_start(GTK_DIALOG(dialog), TRUE);
- }
-
- tgh_child_exit(pid, status, args->parser);
-
- g_free(args);
-}
-
-gboolean add_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
+static gboolean add_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
{
GError *error = NULL;
- gint fd_err;
- GIOChannel *chan_err;
+ gint fd_out, fd_err;
+ GIOChannel *chan_out, *chan_err;
TghOutputParser *parser;
gsize length;
gint i;
gchar **argv;
- struct exit_args *args = g_new(struct exit_args, 1);
- length = 3;
+ length = 5;
length += g_strv_length(files);
argv = g_new(gchar*, length);
argv[0] = "git";
argv[1] = "add";
+ argv[2] = "-v";
+ argv[3] = "--";
argv[length-1] = NULL;
- i = 2;
+ i = 4;
while(*files)
argv[i++] = *files++;
- if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
{
+ g_free (argv);
return FALSE;
}
+ g_free (argv);
parser = tgh_error_parser_new(GTK_WIDGET(dialog));
- args->parser = parser;
- args->dialog = dialog;
-
- g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+ g_child_watch_add(*pid, (GChildWatchFunc)tgh_child_exit, parser);
+ chan_out = g_io_channel_unix_new(fd_out);
chan_err = g_io_channel_unix_new(fd_err);
+ g_io_add_watch(chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_notify_parser_new(GTK_WIDGET(dialog)));
g_io_add_watch(chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
return TRUE;
@@ -110,8 +82,20 @@ gboolean tgh_add (gchar **files, GPid *pid)
{
GtkWidget *dialog;
- dialog = tgh_file_selection_dialog_new (_("Add"), NULL, 0, files, TGH_FILE_SELECTION_FLAG_MODIFIED|TGH_FILE_SELECTION_FLAG_UNTRACKED);
- if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+ if (files)
+ if (chdir(files[0]))
+ {
+ gchar *dirname = g_path_get_dirname (files[0]);
+ if (chdir(dirname))
+ {
+ g_free (dirname);
+ return FALSE;
+ }
+ g_free (dirname);
+ }
+
+ dialog = tgh_file_selection_dialog_new (_("Add"), NULL, 0, TGH_FILE_SELECTION_FLAG_MODIFIED|TGH_FILE_SELECTION_FLAG_UNTRACKED);
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
{
gtk_widget_destroy (dialog);
return FALSE;
@@ -120,13 +104,13 @@ gboolean tgh_add (gchar **files, GPid *pid)
files = tgh_file_selection_dialog_get_files (TGH_FILE_SELECTION_DIALOG (dialog));
gtk_widget_destroy (dialog);
- if(!files)
+ if (!files)
return FALSE;
- dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CANCEL, _("Adding ..."));
- g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (tgh_cancel), NULL);
- tgh_dialog_start(GTK_DIALOG(dialog), TRUE);
+ dialog = tgh_notify_dialog_new (_("Add"), NULL, 0);
+ g_signal_connect (dialog, "cancel-clicked", tgh_cancel, NULL);
+ tgh_dialog_start (GTK_DIALOG(dialog), TRUE);
- return add_spawn(dialog, files, pid);
+ return add_spawn (dialog, files, pid);
}
diff --git a/tvp-git-helper/tgh-reset-dialog.c b/tvp-git-helper/tgh-blame-dialog.c
similarity index 64%
copy from tvp-git-helper/tgh-reset-dialog.c
copy to tvp-git-helper/tgh-blame-dialog.c
index 539bea8..24adf64 100644
--- a/tvp-git-helper/tgh-reset-dialog.c
+++ b/tvp-git-helper/tgh-blame-dialog.c
@@ -21,14 +21,15 @@
#include <config.h>
#endif
-#include <libxfce4util/libxfce4util.h>
+#include <thunar-vfs/thunar-vfs.h>
#include <gtk/gtk.h>
-#include "tgh-reset-dialog.h"
+#include "tgh-common.h"
+#include "tgh-blame-dialog.h"
static void cancel_clicked (GtkButton*, gpointer);
-struct _TghResetDialog
+struct _TghBlameDialog
{
GtkDialog dialog;
@@ -37,12 +38,12 @@ struct _TghResetDialog
GtkWidget *cancel;
};
-struct _TghResetDialogClass
+struct _TghBlameDialogClass
{
GtkDialogClass dialog_class;
};
-G_DEFINE_TYPE (TghResetDialog, tgh_reset_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (TghBlameDialog, tgh_blame_dialog, GTK_TYPE_DIALOG)
enum {
SIGNAL_CANCEL = 0,
@@ -52,28 +53,31 @@ enum {
static guint signals[SIGNAL_COUNT];
static void
-tgh_reset_dialog_class_init (TghResetDialogClass *klass)
+tgh_blame_dialog_class_init (TghBlameDialogClass *klass)
{
signals[SIGNAL_CANCEL] = g_signal_new("cancel-clicked",
- G_OBJECT_CLASS_TYPE (klass),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
- 0, NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
enum {
- COLUMN_PATH = 0,
- COLUMN_STAT,
+ COLUMN_LINE_NO = 0,
+ COLUMN_REVISION,
+ COLUMN_AUTHOR,
+ COLUMN_DATE,
+ COLUMN_LINE,
COLUMN_COUNT
};
static void
-tgh_reset_dialog_init (TghResetDialog *dialog)
+tgh_blame_dialog_init (TghBlameDialog *dialog)
{
- GtkWidget *button;
GtkWidget *tree_view;
GtkWidget *scroll_window;
+ GtkWidget *button;
GtkCellRenderer *renderer;
GtkTreeModel *model;
@@ -81,20 +85,38 @@ tgh_reset_dialog_init (TghResetDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
- -1, _("Path"),
- renderer, "text",
- COLUMN_PATH, NULL);
-
+ -1, _("Line"), renderer,
+ "text", COLUMN_LINE_NO,
+ NULL);
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
- -1, _("Status"),
- renderer, "text",
- COLUMN_STAT, NULL);
+ -1, _("Revision"), renderer,
+ "text", COLUMN_REVISION,
+ NULL);
- model = GTK_TREE_MODEL (gtk_list_store_new (COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING));
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Author"), renderer,
+ "text", COLUMN_AUTHOR,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Date"), renderer,
+ "text", COLUMN_DATE,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, NULL, renderer,
+ "text", COLUMN_LINE,
+ NULL);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (COLUMN_COUNT, G_TYPE_INT64, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
@@ -105,7 +127,7 @@ tgh_reset_dialog_init (TghResetDialog *dialog)
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Reset"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Blame"));
dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
@@ -119,9 +141,9 @@ tgh_reset_dialog_init (TghResetDialog *dialog)
}
GtkWidget*
-tgh_reset_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
+tgh_blame_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
{
- TghResetDialog *dialog = g_object_new (TGH_TYPE_RESET_DIALOG, NULL);
+ TghBlameDialog *dialog = g_object_new (TGH_TYPE_BLAME_DIALOG, NULL);
if(title)
gtk_window_set_title (GTK_WINDOW(dialog), title);
@@ -142,32 +164,29 @@ tgh_reset_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flag
}
void
-tgh_reset_dialog_add (TghResetDialog *dialog, const gchar *file, const gchar *state)
+tgh_blame_dialog_add (TghBlameDialog *dialog, gint64 line_no, const gchar *revision, const gchar *author, const gchar *date, const gchar *line)
{
GtkTreeModel *model;
GtkTreeIter iter;
- GtkTreePath *path;
- g_return_if_fail (TGH_IS_RESET_DIALOG (dialog));
+ g_return_if_fail (TGH_IS_BLAME_DIALOG (dialog));
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
- COLUMN_PATH, file,
- COLUMN_STAT, state,
- -1);
-
- path = gtk_tree_model_get_path (model, &iter);
- gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (dialog->tree_view), path, NULL, FALSE, 0, 0);
-
- gtk_tree_path_free (path);
+ COLUMN_LINE_NO, line_no,
+ COLUMN_REVISION, revision,
+ COLUMN_AUTHOR, author,
+ COLUMN_DATE, date,
+ COLUMN_LINE, line,
+ -1);
}
void
-tgh_reset_dialog_done (TghResetDialog *dialog)
+tgh_blame_dialog_done (TghBlameDialog *dialog)
{
- g_return_if_fail (TGH_IS_RESET_DIALOG (dialog));
+ g_return_if_fail (TGH_IS_BLAME_DIALOG (dialog));
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
@@ -176,11 +195,11 @@ tgh_reset_dialog_done (TghResetDialog *dialog)
static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
- TghResetDialog *dialog = TGH_RESET_DIALOG (user_data);
-
+ TghBlameDialog *dialog = TGH_BLAME_DIALOG (user_data);
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
diff --git a/tvp-git-helper/tgh-blame-dialog.h b/tvp-git-helper/tgh-blame-dialog.h
new file mode 100644
index 0000000..b7d50cd
--- /dev/null
+++ b/tvp-git-helper/tgh-blame-dialog.h
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __TGH_BLAME_DIALOG_H__
+#define __TGH_BLAME_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _TghBlameDialogClass TghBlameDialogClass;
+typedef struct _TghBlameDialog TghBlameDialog;
+
+#define TGH_TYPE_BLAME_DIALOG (tgh_blame_dialog_get_type ())
+#define TGH_BLAME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TGH_TYPE_BLAME_DIALOG, TghBlameDialog))
+#define TGH_BLAME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TGH_TYPE_BLAME_DIALOG, TghBlameDialogClass))
+#define TGH_IS_BLAME_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TGH_TYPE_BLAME_DIALOG))
+#define TGH_IS_BLAME_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TGH_TYPE_BLAME_DIALOG))
+#define TGH_BLAME_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TGH_TYPE_BLAME_DIALOG, TghBlameDialogClass))
+
+GType tgh_blame_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tgh_blame_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+void tgh_blame_dialog_add (TghBlameDialog *dialog,
+ gint64 line_no,
+ const gchar *revision,
+ const gchar *author,
+ const gchar *date,
+ const gchar *line);
+void tgh_blame_dialog_done (TghBlameDialog *dialog);
+
+G_END_DECLS;
+
+#endif /* !__TGH_BLAME_DIALOG_H__ */
diff --git a/tvp-git-helper/tgh-blame.c b/tvp-git-helper/tgh-blame.c
new file mode 100644
index 0000000..61b3b2e
--- /dev/null
+++ b/tvp-git-helper/tgh-blame.c
@@ -0,0 +1,95 @@
+/*-
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "tgh-common.h"
+#include "tgh-dialog-common.h"
+#include "tgh-blame-dialog.h"
+
+#include "tgh-blame.h"
+
+static gboolean blame_spawn (GtkWidget *dialog, gchar *file, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_out, fd_err;
+ GIOChannel *chan_out, *chan_err;
+ TghOutputParser *parser;
+ gchar **argv;
+
+ argv = g_new (gchar*, 5);
+
+ argv[0] = "git";
+ argv[1] = "blame";
+ argv[2] = "--";
+ argv[3] = file;
+ argv[4] = NULL;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (dialog);
+
+ g_child_watch_add (*pid, (GChildWatchFunc)tgh_child_exit, parser);
+
+ chan_out = g_io_channel_unix_new (fd_out);
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_blame_parser_new (dialog));
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+gboolean tgh_blame (gchar **files, GPid *pid)
+{
+ GtkWidget *dialog;
+
+ if (!files)
+ return FALSE;
+
+ if (chdir(files[0]))
+ {
+ gchar *dirname = g_path_get_dirname (files[0]);
+ if (chdir(dirname))
+ {
+ g_free (dirname);
+ return FALSE;
+ }
+ g_free (dirname);
+ }
+
+ dialog = tgh_blame_dialog_new (NULL, NULL, 0);
+ g_signal_connect (dialog, "cancel-clicked", tgh_cancel, NULL);
+ tgh_dialog_start (GTK_DIALOG(dialog), TRUE);
+
+ return blame_spawn (dialog, files[0], pid);
+}
+
diff --git a/tvp-git-helper/tgh-reset.h b/tvp-git-helper/tgh-blame.h
similarity index 86%
copy from tvp-git-helper/tgh-reset.h
copy to tvp-git-helper/tgh-blame.h
index 954c6f3..a152116 100644
--- a/tvp-git-helper/tgh-reset.h
+++ b/tvp-git-helper/tgh-blame.h
@@ -14,14 +14,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __TGH_RESET_H__
-#define __TGH_RESET_H__
+#ifndef __TGH_BLAME_H__
+#define __TGH_BLAME_H__
G_BEGIN_DECLS
-gboolean tgh_reset (gchar **, GPid *);
+gboolean tgh_blame (gchar **, GPid *);
G_END_DECLS
-#endif /*__TGH_RESET_H__*/
+#endif /*__TGH_BLAME_H__*/
diff --git a/tvp-git-helper/tgh-branch.c b/tvp-git-helper/tgh-branch.c
index 2f489d7..2708eca 100644
--- a/tvp-git-helper/tgh-branch.c
+++ b/tvp-git-helper/tgh-branch.c
@@ -39,14 +39,7 @@
static gchar *argv[] = {"git", "branch", NULL};
-struct proc_args
-{
- GtkWidget *dialog;
- gchar *error;
- gchar **files;
-};
-
-gboolean branch_spawn (TghBranchDialog *dialog, GPid *pid)
+static gboolean branch_spawn (TghBranchDialog *dialog, GPid *pid)
{
GError *error = NULL;
gint fd_out;
@@ -92,7 +85,8 @@ gboolean tgh_branch (gchar **files, GPid *pid)
g_signal_connect(dialog, "refresh-clicked", G_CALLBACK(create_branch_child), NULL);
if (files)
- chdir(files[0]);
+ if (chdir(files[0]))
+ return FALSE;
return branch_spawn(TGH_BRANCH_DIALOG(dialog), pid);
}
diff --git a/tvp-git-helper/tgh-clean-dialog.c b/tvp-git-helper/tgh-clean-dialog.c
new file mode 100644
index 0000000..24c2f6c
--- /dev/null
+++ b/tvp-git-helper/tgh-clean-dialog.c
@@ -0,0 +1,171 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs.h>
+#include <gtk/gtk.h>
+
+#include "tgh-clean-dialog.h"
+
+struct _TghCleanDialog
+{
+ GtkDialog dialog;
+
+ GtkWidget *directories;
+ GtkWidget *ignore;
+ GtkWidget *force;
+};
+
+struct _TghCleanDialogClass
+{
+ GtkDialogClass dialog_class;
+};
+
+G_DEFINE_TYPE (TghCleanDialog, tgh_clean_dialog, GTK_TYPE_DIALOG)
+
+static void
+tgh_clean_dialog_class_init (TghCleanDialogClass *klass)
+{
+}
+
+static void
+tgh_clean_dialog_init (TghCleanDialog *dialog)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkCellRenderer *renderer;
+
+ dialog->directories = gtk_check_button_new_with_label (_("Remove directories."));
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->directories, FALSE, TRUE, 0);
+ gtk_widget_show(dialog->directories);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT));
+
+ dialog->ignore = gtk_combo_box_new_with_model (model);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->ignore, FALSE, TRUE, 0);
+ gtk_widget_show(dialog->ignore);
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ 0, _("Excldue ignored files"),
+ 1, TGH_CLEAN_IGNORE_EXCLUDE,
+ -1);
+
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (dialog->ignore), &iter);
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ 0, _("Include ignored files"),
+ 1, TGH_CLEAN_IGNORE_INCLUDE,
+ -1);
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ 0, _("Only ignored files"),
+ 1, TGH_CLEAN_IGNORE_ONLY,
+ -1);
+
+ g_object_unref (model);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (dialog->ignore), renderer, TRUE);
+ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (dialog->ignore), renderer, "text", 0);
+
+ dialog->force = gtk_check_button_new_with_label (_("Force clean."));
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), dialog->force, FALSE, TRUE, 0);
+ gtk_widget_show(dialog->force);
+
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Clean"));
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+}
+
+GtkWidget*
+tgh_clean_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
+{
+ TghCleanDialog *dialog = g_object_new (TSH_TYPE_TRUST_DIALOG, NULL);
+
+ if(title)
+ gtk_window_set_title (GTK_WINDOW(dialog), title);
+
+ if(parent)
+ gtk_window_set_transient_for (GTK_WINDOW(dialog), parent);
+
+ if(flags & GTK_DIALOG_MODAL)
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_NO_SEPARATOR)
+ gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
+
+ return GTK_WIDGET(dialog);
+}
+
+gboolean
+tgh_clean_dialog_get_diretories (TghCleanDialog *dialog)
+{
+ g_return_val_if_fail (TGH_IS_CLEAN_DIALOG (dialog), FALSE);
+
+ return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->directories));
+}
+
+TghCleanIgnore
+tgh_clean_dialog_get_ignore (TghCleanDialog *dialog)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ TghCleanIgnore ignore;
+ GValue value;
+
+ memset(&value, 0, sizeof(GValue));
+
+ g_return_val_if_fail (TGH_IS_CLEAN_DIALOG (dialog), TGH_CLEAN_IGNORE_EXCLUDE);
+
+ g_return_val_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->ignore), &iter), TGH_CLEAN_IGNORE_EXCLUDE);
+
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->ignore));
+ gtk_tree_model_get_value (model, &iter, 1, &value);
+
+ ignore = g_value_get_int (&value);
+
+ g_value_unset(&value);
+
+ return ignore;
+}
+
+gboolean
+tgh_clean_dialog_get_force (TghCleanDialog *dialog)
+{
+ g_return_val_if_fail (TGH_IS_CLEAN_DIALOG (dialog), FALSE);
+
+ return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->force));
+}
+
diff --git a/tvp-git-helper/tgh-clean-dialog.h b/tvp-git-helper/tgh-clean-dialog.h
new file mode 100644
index 0000000..78ddeec
--- /dev/null
+++ b/tvp-git-helper/tgh-clean-dialog.h
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __TGH_CLEAN_DIALOG_H__
+#define __TGH_CLEAN_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef enum
+{
+ TGH_CLEAN_IGNORE_EXCLUDE,
+ TGH_CLEAN_IGNORE_INCLUDE,
+ TGH_CLEAN_IGNORE_ONLY
+} TghCleanIgnore;
+
+typedef struct _TghCleanDialogClass TghCleanDialogClass;
+typedef struct _TghCleanDialog TghCleanDialog;
+
+#define TSH_TYPE_TRUST_DIALOG (tgh_clean_dialog_get_type ())
+#define TGH_CLEAN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TSH_TYPE_TRUST_DIALOG, TghCleanDialog))
+#define TGH_CLEAN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TSH_TYPE_TRUST_DIALOG, TghCleanDialogClass))
+#define TGH_IS_CLEAN_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TSH_TYPE_TRUST_DIALOG))
+#define TGH_IS_CLEAN_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TSH_TYPE_TRUST_DIALOG))
+#define TGH_CLEAN_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TSH_TYPE_TRUST_DIALOG, TghCleanDialogClass))
+
+GType tgh_clean_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tgh_clean_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+gboolean tgh_clean_dialog_get_diretories (TghCleanDialog *dialog);
+
+TghCleanIgnore tgh_clean_dialog_get_ignore (TghCleanDialog *dialog);
+
+gboolean tgh_clean_dialog_get_force (TghCleanDialog *dialog);
+
+G_END_DECLS;
+
+#endif /* !__TGH_CLEAN_DIALOG_H__ */
diff --git a/tvp-git-helper/tgh-clean.c b/tvp-git-helper/tgh-clean.c
new file mode 100644
index 0000000..632ee5c
--- /dev/null
+++ b/tvp-git-helper/tgh-clean.c
@@ -0,0 +1,147 @@
+/*-
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "tgh-common.h"
+#include "tgh-dialog-common.h"
+#include "tgh-clean-dialog.h"
+#include "tgh-notify-dialog.h"
+
+#include "tgh-clean.h"
+
+static gboolean clean_spawn (GtkWidget *dialog, gchar **files, gboolean direcotries, TghCleanIgnore ignore, gboolean force, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_out, fd_err;
+ GIOChannel *chan_out, *chan_err;
+ TghOutputParser *parser;
+ gsize length;
+ gint i;
+ gchar **argv;
+
+ length = 4;
+ if (direcotries)
+ length++;
+ if (ignore != TGH_CLEAN_IGNORE_EXCLUDE)
+ length++;
+ if (force)
+ length++;
+ length += g_strv_length (files);
+
+ argv = g_new (gchar*, length);
+
+ argv[0] = "git";
+ argv[1] = "clean";
+ argv[length-1] = NULL;
+
+ i = 2;
+ if (direcotries)
+ argv[i++] = "-d";
+ switch (ignore)
+ {
+ case TGH_CLEAN_IGNORE_EXCLUDE:
+ break;
+ case TGH_CLEAN_IGNORE_INCLUDE:
+ argv[i++] = "-x";
+ break;
+ case TGH_CLEAN_IGNORE_ONLY:
+ argv[i++] = "-X";
+ break;
+ }
+ if (force)
+ argv[i++] = "-f";
+ argv[i++] = "--";
+
+ while (*files)
+ argv[i++] = *files++;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ g_child_watch_add (*pid, (GChildWatchFunc)tgh_child_exit, parser);
+
+ chan_out = g_io_channel_unix_new (fd_out);
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_clean_parser_new (dialog));
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+gboolean tgh_clean (gchar **files, GPid *pid)
+{
+ GtkWidget *dialog;
+ gboolean direcotries, force;
+ TghCleanIgnore ignore;
+
+ if (files)
+ if (chdir(files[0]))
+ {
+ gchar *dirname = g_path_get_dirname (files[0]);
+ if (chdir(dirname))
+ {
+ g_free (dirname);
+ return FALSE;
+ }
+ g_free (dirname);
+ }
+
+ dialog = tgh_clean_dialog_new (NULL, NULL, 0);
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+ {
+ gtk_widget_destroy (dialog);
+ return FALSE;
+ }
+
+ direcotries = tgh_clean_dialog_get_diretories (TGH_CLEAN_DIALOG (dialog));
+ ignore = tgh_clean_dialog_get_ignore (TGH_CLEAN_DIALOG (dialog));
+ force = tgh_clean_dialog_get_force (TGH_CLEAN_DIALOG (dialog));
+
+ gtk_widget_destroy (dialog);
+
+ dialog = tgh_notify_dialog_new (_("Clean"), NULL, 0);
+ g_signal_connect (dialog, "cancel-clicked", tgh_cancel, NULL);
+ tgh_dialog_start (GTK_DIALOG(dialog), TRUE);
+
+ return clean_spawn (dialog, files, direcotries, ignore, force, pid);
+}
+
diff --git a/tvp-git-helper/tgh-reset.h b/tvp-git-helper/tgh-clean.h
similarity index 86%
copy from tvp-git-helper/tgh-reset.h
copy to tvp-git-helper/tgh-clean.h
index 954c6f3..cadb048 100644
--- a/tvp-git-helper/tgh-reset.h
+++ b/tvp-git-helper/tgh-clean.h
@@ -14,14 +14,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __TGH_RESET_H__
-#define __TGH_RESET_H__
+#ifndef __TGH_CLEAN_H__
+#define __TGH_CLEAN_H__
G_BEGIN_DECLS
-gboolean tgh_reset (gchar **, GPid *);
+gboolean tgh_clean (gchar **, GPid *);
G_END_DECLS
-#endif /*__TGH_RESET_H__*/
+#endif /*__TGH_CLEAN_H__*/
diff --git a/tvp-git-helper/tgh-add.c b/tvp-git-helper/tgh-clone.c
similarity index 66%
copy from tvp-git-helper/tgh-add.c
copy to tvp-git-helper/tgh-clone.c
index 78400cc..76ccfd5 100644
--- a/tvp-git-helper/tgh-add.c
+++ b/tvp-git-helper/tgh-clone.c
@@ -33,13 +33,13 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
+#include <thunar-vfs/thunar-vfs.h>
#include "tgh-common.h"
#include "tgh-dialog-common.h"
-#include "tgh-file-selection-dialog.h"
+#include "tgh-transfer-dialog.h"
-#include "tgh-add.h"
+#include "tgh-clone.h"
struct exit_args
{
@@ -55,7 +55,7 @@ static void child_exit(GPid pid, gint status, gpointer user_data)
if(WEXITSTATUS(status) <= 1)
{
- GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Add finished"));
+ GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Clone finished"));
tgh_dialog_start(GTK_DIALOG(dialog), TRUE);
}
@@ -64,37 +64,34 @@ static void child_exit(GPid pid, gint status, gpointer user_data)
g_free(args);
}
-gboolean add_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
+static gboolean clone_spawn (GtkWidget *dialog, gchar *repository, gchar *path, GPid *pid)
{
GError *error = NULL;
gint fd_err;
GIOChannel *chan_err;
TghOutputParser *parser;
- gsize length;
- gint i;
gchar **argv;
- struct exit_args *args = g_new(struct exit_args, 1);
+ struct exit_args *args;
- length = 3;
- length += g_strv_length(files);
-
- argv = g_new(gchar*, length);
+ argv = g_new(gchar*, 6);
argv[0] = "git";
- argv[1] = "add";
- argv[length-1] = NULL;
-
- i = 2;
- while(*files)
- argv[i++] = *files++;
+ argv[1] = "clone";
+ argv[2] = "--";
+ argv[3] = repository;
+ argv[4] = path;
+ argv[5] = NULL;
if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
{
+ g_free (argv);
return FALSE;
}
+ g_free (argv);
parser = tgh_error_parser_new(GTK_WIDGET(dialog));
+ args = g_new(struct exit_args, 1);
args->parser = parser;
args->dialog = dialog;
@@ -106,27 +103,27 @@ gboolean add_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
return TRUE;
}
-gboolean tgh_add (gchar **files, GPid *pid)
+gboolean tgh_clone (gchar **files, GPid *pid)
{
GtkWidget *dialog;
+ gchar *repository;
+ gchar *path;
- dialog = tgh_file_selection_dialog_new (_("Add"), NULL, 0, files, TGH_FILE_SELECTION_FLAG_MODIFIED|TGH_FILE_SELECTION_FLAG_UNTRACKED);
- if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+ dialog = tgh_transfer_dialog_new (_("Clone"), NULL, 0, NULL, files?files[0]:NULL);
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
{
gtk_widget_destroy (dialog);
return FALSE;
}
g_strfreev (files);
- files = tgh_file_selection_dialog_get_files (TGH_FILE_SELECTION_DIALOG (dialog));
+ repository = tgh_transfer_dialog_get_repository (TGH_TRANSFER_DIALOG (dialog));
+ path = tgh_transfer_dialog_get_directory(TGH_TRANSFER_DIALOG(dialog));
gtk_widget_destroy (dialog);
- if(!files)
- return FALSE;
-
- dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CANCEL, _("Adding ..."));
- g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (tgh_cancel), NULL);
- tgh_dialog_start(GTK_DIALOG(dialog), TRUE);
+ dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CANCEL, _("Cloning ..."));
+ g_signal_connect (dialog, "response", tgh_cancel, NULL);
+ tgh_dialog_start (GTK_DIALOG(dialog), TRUE);
- return add_spawn(dialog, files, pid);
+ return clone_spawn(dialog, repository, path, pid);
}
diff --git a/tvp-git-helper/tgh-reset.h b/tvp-git-helper/tgh-clone.h
similarity index 86%
copy from tvp-git-helper/tgh-reset.h
copy to tvp-git-helper/tgh-clone.h
index 954c6f3..d8af9da 100644
--- a/tvp-git-helper/tgh-reset.h
+++ b/tvp-git-helper/tgh-clone.h
@@ -14,14 +14,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __TGH_RESET_H__
-#define __TGH_RESET_H__
+#ifndef __TGH_CLONE_H__
+#define __TGH_CLONE_H__
G_BEGIN_DECLS
-gboolean tgh_reset (gchar **, GPid *);
+gboolean tgh_clone (gchar **, GPid *);
G_END_DECLS
-#endif /*__TGH_RESET_H__*/
+#endif /*__TGH_CLONE_H__*/
diff --git a/tvp-git-helper/tgh-common.c b/tvp-git-helper/tgh-common.c
index f31ab72..f883564 100644
--- a/tvp-git-helper/tgh-common.c
+++ b/tvp-git-helper/tgh-common.c
@@ -36,18 +36,51 @@
#include <libxfce4util/libxfce4util.h>
#include "tgh-dialog-common.h"
+#include "tgh-notify-dialog.h"
#include "tgh-status-dialog.h"
+#include "tgh-log-dialog.h"
#include "tgh-branch-dialog.h"
+#include "tgh-stash-dialog.h"
+#include "tgh-blame-dialog.h"
#include "tgh-common.h"
static void
-create_error_dialog(GtkWindow *parent, gchar *message)
+create_error_dialog (GtkWindow *parent, gchar *message)
{
- GtkWidget *error;
- error = gtk_message_dialog_new(GTK_WINDOW(parent), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Status failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), g_strstrip(message));
- tgh_dialog_start(GTK_DIALOG(error), FALSE);
+ if (TGH_IS_NOTIFY_DIALOG (parent))
+ {
+ gchar **lines, **iter;
+ lines = g_strsplit_set (message, "\r\n", -1);
+
+ for (iter = lines; *iter; iter++)
+ {
+ gchar *action, *text;
+
+ if ((*iter)[1])
+ {
+ text = *iter;
+ action = strchr (text, ':');
+ if (action)
+ {
+ *action = '\0';
+ text = action+2;
+ action = *iter;
+ }
+
+ tgh_notify_dialog_add (TGH_NOTIFY_DIALOG (parent), action, text);
+ }
+ }
+
+ g_strfreev (lines);
+ }
+ else
+ {
+ GtkWidget *error;
+ error = gtk_message_dialog_new (parent?GTK_WINDOW (parent):NULL, parent?GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL:0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Failed"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error), "%s", g_strstrip (message));
+ tgh_dialog_start (GTK_DIALOG (error), !parent);
+ }
}
void
@@ -66,7 +99,7 @@ void
tgh_child_exit(GPid pid, gint status, gpointer user_data)
{
TghErrorParser *parser = user_data;
- if(WEXITSTATUS(status) > 1)
+ if(WEXITSTATUS(status))
{
if(parser->done)
create_error_dialog(GTK_WINDOW(parser->dialog), parser->error);
@@ -104,7 +137,54 @@ tgh_error_parser_new(GtkWidget *dialog)
typedef struct {
TghOutputParser parent;
GtkWidget *dialog;
- gboolean commit;
+} TghNotifyParser;
+
+static void
+notify_parser_func(TghNotifyParser *parser, gchar *line)
+{
+ TghNotifyDialog *dialog = TGH_NOTIFY_DIALOG(parser->dialog);
+ if(line)
+ {
+ gchar *action, *file;
+
+ file = strchr(line, '\'');
+ if(file)
+ {
+ *file++ = '\0';
+ *strrchr(file, '\'') = '\0';
+
+ action = g_strstrip(line);
+
+ tgh_notify_dialog_add(dialog, action, file);
+ }
+ }
+ else
+ {
+ tgh_notify_dialog_done(dialog);
+ g_free(parser);
+ }
+}
+
+TghOutputParser*
+tgh_notify_parser_new (GtkWidget *dialog)
+{
+ TghNotifyParser *parser = g_new(TghNotifyParser,1);
+
+ TGH_OUTPUT_PARSER(parser)->parse = TGH_OUTPUT_PARSER_FUNC(notify_parser_func);
+
+ parser->dialog = dialog;
+
+ return TGH_OUTPUT_PARSER(parser);
+}
+
+typedef struct {
+ TghOutputParser parent;
+ GtkWidget *dialog;
+ enum {
+ STATUS_COMMIT,
+ STATUS_MODIFIED,
+ STATUS_UNTRACKED
+ } state;
} TghStatusParser;
static void
@@ -113,25 +193,31 @@ status_parser_func(TghStatusParser *parser, gchar *line)
TghStatusDialog *dialog = TGH_STATUS_DIALOG(parser->dialog);
if(line)
{
- if(strstr(line, "git reset"))
- parser->commit = TRUE;
- else if(strstr(line, "git add"))
- parser->commit = FALSE;
if(line[0] == '#' && line[1] == '\t')
{
gchar *file = strchr(line, ':');
gchar *state = _("untracked");
- if(file)
+ if(file && parser->state != STATUS_UNTRACKED)
{
*file = '\0';
state = line+2;
- file = g_strstrip(file+1);
+ file = line+14;
}
else
- file = g_strstrip(line+2);
+ file = line+2;
+ file[strlen(file)-1] = '\0';
+ file = g_shell_unquote(file, NULL);
- tgh_status_dialog_add(dialog, file, state, parser->commit);
+ tgh_status_dialog_add(dialog, file, state, parser->state == STATUS_COMMIT);
+
+ g_free(file);
}
+ else if(strstr(line, "git reset"))
+ parser->state = STATUS_COMMIT;
+ else if(strstr(line, "git add"))
+ parser->state = STATUS_UNTRACKED;
+ else if(strstr(line, "git checkout"))
+ parser->state = STATUS_MODIFIED;
}
else
{
@@ -155,6 +241,117 @@ tgh_status_parser_new (GtkWidget *dialog)
typedef struct {
TghOutputParser parent;
GtkWidget *dialog;
+ gchar *revision;
+ gchar *author;
+ gchar *author_date;
+ gchar *commit;
+ gchar *commit_date;
+ gchar *message;
+ GSList *files;
+} TghLogParser;
+
+static void
+log_parser_add_entry(TghLogParser *parser, TghLogDialog *dialog)
+{
+ tgh_log_dialog_add(dialog,
+ g_slist_reverse(parser->files),
+ parser->revision,
+ parser->author,
+ parser->author_date,
+ parser->commit,
+ parser->commit_date,
+ parser->message);
+
+ parser->files = NULL;
+ g_free(parser->revision);
+ parser->revision = NULL;
+ parser->author = NULL;
+ g_free(parser->author_date);
+ parser->author_date = NULL;
+ g_free(parser->commit);
+ parser->commit = NULL;
+ g_free(parser->commit_date);
+ parser->commit_date = NULL;
+ g_free(parser->message);
+ parser->message = NULL;
+}
+
+static void
+log_parser_func(TghLogParser *parser, gchar *line)
+{
+ TghLogDialog *dialog = TGH_LOG_DIALOG(parser->dialog);
+ if(line)
+ {
+ if(strncmp(line, "commit ", 7) == 0)
+ {
+ gchar *revision;
+
+ if(parser->revision)
+ log_parser_add_entry(parser, dialog);
+
+ // read first 6 chars of hash?
+ revision = g_strstrip(line+6);
+ parser->revision = g_strndup(revision, revision[0]=='-'?7:6);
+ }
+ else if(strncmp(line, "Author:", 7) == 0)
+ {
+ parser->author = g_strdup(g_strstrip(line+7));
+ }
+ else if(strncmp(line, "AuthorDate:", 11) == 0)
+ {
+ parser->author_date = g_strdup(g_strstrip(line+11));
+ }
+ else if(strncmp(line, "Commit:", 7) == 0)
+ {
+ parser->commit = g_strdup(g_strstrip(line+7));
+ }
+ else if(strncmp(line, "CommitDate:", 11) == 0)
+ {
+ parser->commit_date = g_strdup(g_strstrip(line+11));
+ }
+ else if(strncmp(line, " ", 4) == 0)
+ {
+ if(parser->message)
+ parser->message = g_strconcat(parser->message, line+4, NULL);
+ else
+ parser->message = g_strdup(line+4);
+ }
+ else if(g_ascii_isdigit(line[0]))
+ {
+ gchar *ptr, *path;
+ TghLogFile *file;
+ file = g_new(TghLogFile, 1);
+ file->insertions = strtoul(line, &ptr, 10);
+ file->deletions = strtoul(ptr, &path, 10);
+ path++;
+ file->file = g_strndup (path, strlen(path)-1);
+ parser->files = g_slist_prepend (parser->files, file);
+ }
+ }
+ else
+ {
+ if(parser->revision)
+ log_parser_add_entry(parser, dialog);
+ tgh_log_dialog_done(dialog);
+ g_free(parser);
+ }
+}
+
+TghOutputParser*
+tgh_log_parser_new (GtkWidget *dialog)
+{
+ TghLogParser *parser = g_new0(TghLogParser,1);
+
+ TGH_OUTPUT_PARSER(parser)->parse = TGH_OUTPUT_PARSER_FUNC(log_parser_func);
+
+ parser->dialog = dialog;
+
+ return TGH_OUTPUT_PARSER(parser);
+}
+
+typedef struct {
+ TghOutputParser parent;
+ GtkWidget *dialog;
} TghBranchParser;
static void
@@ -186,6 +383,190 @@ tgh_branch_parser_new (GtkWidget *dialog)
return TGH_OUTPUT_PARSER(parser);
}
+typedef struct {
+ TghOutputParser parent;
+ GtkWidget *dialog;
+} TghStashListParser;
+
+static void
+stash_list_parser_func (TghStashListParser *parser, gchar *line)
+{
+ TghStashDialog *dialog = TGH_STASH_DIALOG (parser->dialog);
+ if (line)
+ {
+ gchar *stash, *branch, *desc;
+ branch = strchr (line, ':');
+ *branch++ = '\0';
+ stash = g_strstrip (line);
+ desc = strchr (branch, ':');
+ *desc++ = '\0';
+ branch = g_strstrip (branch);
+ desc = g_strstrip (desc);
+ tgh_stash_dialog_add (dialog, stash, branch, desc);
+ }
+ else
+ {
+ tgh_stash_dialog_done (dialog);
+ g_free (parser);
+ }
+}
+
+TghOutputParser*
+tgh_stash_list_parser_new (GtkWidget *dialog)
+{
+ TghStashListParser *parser = g_new (TghStashListParser,1);
+
+ TGH_OUTPUT_PARSER (parser)->parse = TGH_OUTPUT_PARSER_FUNC (stash_list_parser_func);
+
+ parser->dialog = dialog;
+
+ return TGH_OUTPUT_PARSER (parser);
+}
+
+typedef struct {
+ TghOutputParser parent;
+ GtkWidget *dialog;
+} TghStashShowParser;
+
+static void
+stash_show_parser_func (TghStashShowParser *parser, gchar *line)
+{
+ TghStashDialog *dialog = TGH_STASH_DIALOG (parser->dialog);
+ if (line)
+ {
+ gchar *ptr, *file;
+ guint insertions = strtoul (line, &ptr, 10);
+ guint deletions = strtoul (ptr, &file, 10);
+ file++;
+ file = g_strndup (file, strlen(file)-1);
+ tgh_stash_dialog_add_file (dialog, insertions, deletions, file);
+ }
+ else
+ {
+ tgh_stash_dialog_done (dialog);
+ g_free (parser);
+ }
+}
+
+TghOutputParser*
+tgh_stash_show_parser_new (GtkWidget *dialog)
+{
+ TghStashShowParser *parser = g_new (TghStashShowParser,1);
+
+ TGH_OUTPUT_PARSER (parser)->parse = TGH_OUTPUT_PARSER_FUNC (stash_show_parser_func);
+
+ parser->dialog = dialog;
+
+ return TGH_OUTPUT_PARSER (parser);
+}
+
+typedef struct {
+ TghOutputParser parent;
+ GtkWidget *dialog;
+} TghBlameParser;
+
+static void
+blame_parser_func (TghBlameParser *parser, gchar *line)
+{
+ TghBlameDialog *dialog = TGH_BLAME_DIALOG (parser->dialog);
+ if (line)
+ {
+ gchar *revision, *name, *date, *text, *ptr;
+ guint64 line_no;
+
+ name = strchr (line, '(');
+ *name++ = '\0';
+
+ revision = g_strstrip (line);
+
+ text = strchr (name, ')');
+ *text = '\0';
+ text += 2;
+ text[strlen (text)-1] = '\0';
+
+ ptr = strrchr (name, ' ');
+ line_no = g_ascii_strtoull (ptr, NULL, 10);
+
+ while (*--ptr == ' ');
+ ptr[1] = '\0';
+
+ date = strrchr (name, ' ');
+ *date = '\0';
+ ptr = strrchr (name, ' ');
+ *date = ' ';
+ *ptr = '\0';
+ date = strrchr (name, ' ');
+ *ptr = ' ';
+ *date++ = '\0';
+
+ name = g_strstrip (name);
+
+ tgh_blame_dialog_add (dialog, line_no, revision, name, date, text);
+ }
+ else
+ {
+ tgh_blame_dialog_done (dialog);
+ g_free (parser);
+ }
+}
+
+TghOutputParser*
+tgh_blame_parser_new (GtkWidget *dialog)
+{
+ TghBlameParser *parser = g_new (TghBlameParser,1);
+
+ TGH_OUTPUT_PARSER (parser)->parse = TGH_OUTPUT_PARSER_FUNC (blame_parser_func);
+
+ parser->dialog = dialog;
+
+ return TGH_OUTPUT_PARSER (parser);
+}
+
+typedef struct {
+ TghOutputParser parent;
+ GtkWidget *dialog;
+} TghCleanParser;
+
+static void
+clean_parser_func(TghNotifyParser *parser, gchar *line)
+{
+ TghNotifyDialog *dialog = TGH_NOTIFY_DIALOG(parser->dialog);
+ if(line)
+ {
+ gchar *action, *file;
+
+ action = file = line;
+ if (g_ascii_strncasecmp (line, "Would ", 6) == 0)
+ file += 6;
+
+ if (g_ascii_strncasecmp (file, "Not ", 4) == 0)
+ file += 4;
+
+ file = strchr (file, ' ');
+ *file++ = '\0';
+ file[strlen (file)-1] = '\0';
+
+ tgh_notify_dialog_add(dialog, action, file);
+ }
+ else
+ {
+ tgh_notify_dialog_done(dialog);
+ g_free(parser);
+ }
+}
+
+TghOutputParser*
+tgh_clean_parser_new (GtkWidget *dialog)
+{
+ TghCleanParser *parser = g_new(TghCleanParser,1);
+
+ TGH_OUTPUT_PARSER(parser)->parse = TGH_OUTPUT_PARSER_FUNC(clean_parser_func);
+
+ parser->dialog = dialog;
+
+ return TGH_OUTPUT_PARSER(parser);
+}
+
gboolean
tgh_parse_output_func(GIOChannel *source, GIOCondition condition, gpointer data)
{
diff --git a/tvp-git-helper/tgh-common.h b/tvp-git-helper/tgh-common.h
index caacc93..a8c26fb 100644
--- a/tvp-git-helper/tgh-common.h
+++ b/tvp-git-helper/tgh-common.h
@@ -34,11 +34,22 @@ struct _TghOutputParser {
TghOutputParserFunc parse;
};
-TghOutputParser* tgh_error_parser_new (GtkWidget *);
+TghOutputParser* tgh_error_parser_new (GtkWidget *);
-TghOutputParser* tgh_status_parser_new (GtkWidget *);
+TghOutputParser* tgh_notify_parser_new (GtkWidget *);
-TghOutputParser* tgh_branch_parser_new (GtkWidget *);
+TghOutputParser* tgh_status_parser_new (GtkWidget *);
+
+TghOutputParser* tgh_log_parser_new (GtkWidget *);
+
+TghOutputParser* tgh_branch_parser_new (GtkWidget *);
+
+TghOutputParser* tgh_stash_list_parser_new (GtkWidget *);
+TghOutputParser* tgh_stash_show_parser_new (GtkWidget *);
+
+TghOutputParser* tgh_blame_parser_new (GtkWidget *);
+
+TghOutputParser* tgh_clean_parser_new (GtkWidget *);
gboolean tgh_parse_output_func (GIOChannel *, GIOCondition, gpointer);
diff --git a/tvp-git-helper/tgh-file-selection-dialog.c b/tvp-git-helper/tgh-file-selection-dialog.c
index be9053d..d9865e0 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.c
+++ b/tvp-git-helper/tgh-file-selection-dialog.c
@@ -30,7 +30,7 @@
typedef struct {
TghOutputParser parent;
GtkWidget *dialog;
- enum {STATE_ADDED, STATE_MODIFIED, STATE_UNTRACKED} state;
+ enum {STATUS_ADDED, STATUS_MODIFIED, STATUS_UNTRACKED} state;
} StatusParser;
static void status_parser_func(StatusParser *, gchar *);
@@ -54,6 +54,8 @@ struct _TghFileSelectionDialogClass
G_DEFINE_TYPE (TghFileSelectionDialog, tgh_file_selection_dialog, GTK_TYPE_DIALOG)
+static gchar *argv[] = {"git", "status", NULL};
+
static void
tgh_file_selection_dialog_class_init (TghFileSelectionDialogClass *klass)
{
@@ -141,11 +143,8 @@ static TghOutputParser* status_parser_new (GtkWidget *dialog)
}
GtkWidget*
-tgh_file_selection_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags, gchar **files, TghFileSelectionFlags selection_flags)
+tgh_file_selection_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags, TghFileSelectionFlags selection_flags)
{
- gsize length;
- gint i;
- gchar **argv;
GPid pid;
gint fd_out, fd_err;
GError *error = NULL;
@@ -171,21 +170,6 @@ tgh_file_selection_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogF
dialog->flags = selection_flags;
- length = 3;
- if(files)
- length += g_strv_length(files);
-
- argv = g_new(gchar*, length);
-
- argv[0] = "git";
- argv[1] = "status";
- argv[length-1] = NULL;
-
- i = 2;
- if(files)
- while(*files)
- argv[i++] = *files++;
-
if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, NULL, &fd_out, &fd_err, &error))
{
return FALSE;
@@ -260,38 +244,40 @@ status_parser_func(StatusParser *parser, gchar *line)
if(line)
{
gboolean add = FALSE;
- gboolean select = FALSE;
+ gboolean select_ = FALSE;
if(line[0] == '#' && line[1] == '\t')
{
gchar *file = strchr(line, ':');
gchar *state = _("untracked");
- if(file)
+ if(file && parser->state != STATUS_UNTRACKED)
{
*file = '\0';
state = line+2;
- file = g_strstrip(file+1);
+ file = line+14;
}
else
- file = g_strstrip(line+2);
+ file = line+2;
+ file[strlen(file)-1] = '\0';
+ file = g_shell_unquote(file, NULL);
switch(parser->state)
{
- case STATE_ADDED:
+ case STATUS_ADDED:
if(dialog->flags & TGH_FILE_SELECTION_FLAG_ADDED)
add = TRUE;
- select = TRUE;
+ select_ = TRUE;
break;
- case STATE_MODIFIED:
+ case STATUS_MODIFIED:
if(dialog->flags & TGH_FILE_SELECTION_FLAG_MODIFIED)
add = TRUE;
if(!(dialog->flags & TGH_FILE_SELECTION_FLAG_ADDED))
- select = TRUE;
+ select_ = TRUE;
break;
- case STATE_UNTRACKED:
+ case STATUS_UNTRACKED:
if(dialog->flags & TGH_FILE_SELECTION_FLAG_UNTRACKED)
add = TRUE;
if(!(dialog->flags & (TGH_FILE_SELECTION_FLAG_ADDED|TGH_FILE_SELECTION_FLAG_MODIFIED)))
- select = TRUE;
+ select_ = TRUE;
break;
}
@@ -306,16 +292,18 @@ status_parser_func(StatusParser *parser, gchar *line)
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COLUMN_PATH, file,
COLUMN_STAT, state,
- COLUMN_SELECTION, select,
+ COLUMN_SELECTION, select_,
-1);
}
+
+ g_free(file);
}
else if(strstr(line, "git reset"))
- parser->state = STATE_ADDED;
+ parser->state = STATUS_ADDED;
else if(strstr(line, "git add"))
- parser->state = STATE_UNTRACKED;
+ parser->state = STATUS_UNTRACKED;
else if(strstr(line, "git checkout"))
- parser->state = STATE_MODIFIED;
+ parser->state = STATUS_MODIFIED;
}
else
{
diff --git a/tvp-git-helper/tgh-file-selection-dialog.h b/tvp-git-helper/tgh-file-selection-dialog.h
index cb2ec9d..98b7b98 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.h
+++ b/tvp-git-helper/tgh-file-selection-dialog.h
@@ -45,7 +45,6 @@ GType tgh_file_selection_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTER
GtkWidget* tgh_file_selection_dialog_new (const gchar *title,
GtkWindow *parent,
GtkDialogFlags flags,
- gchar **files,
TghFileSelectionFlags selection_flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
gchar** tgh_file_selection_dialog_get_files (TghFileSelectionDialog *dialog);
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
new file mode 100644
index 0000000..f7938c9
--- /dev/null
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -0,0 +1,380 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs.h>
+#include <gtk/gtk.h>
+
+#include "tgh-common.h"
+#include "tgh-log-dialog.h"
+
+static void selection_changed (GtkTreeView*, gpointer);
+static void cancel_clicked (GtkButton*, gpointer);
+static void refresh_clicked (GtkButton*, gpointer);
+
+struct _TghLogDialog
+{
+ GtkDialog dialog;
+
+ GtkWidget *tree_view;
+ GtkWidget *text_view;
+ GtkWidget *file_view;
+ GtkWidget *close;
+ GtkWidget *cancel;
+ GtkWidget *refresh;
+};
+
+struct _TghLogDialogClass
+{
+ GtkDialogClass dialog_class;
+};
+
+G_DEFINE_TYPE (TghLogDialog, tgh_log_dialog, GTK_TYPE_DIALOG)
+
+enum {
+ SIGNAL_CANCEL = 0,
+ SIGNAL_REFRESH,
+ SIGNAL_COUNT
+};
+
+static guint signals[SIGNAL_COUNT];
+
+static void
+tgh_log_dialog_class_init (TghLogDialogClass *klass)
+{
+ signals[SIGNAL_CANCEL] = g_signal_new("cancel-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ signals[SIGNAL_REFRESH] = g_signal_new("refresh-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+}
+
+enum {
+ COLUMN_REVISION = 0,
+ COLUMN_AUTHOR,
+ COLUMN_AUTHOR_DATE,
+ COLUMN_COMMIT,
+ COLUMN_COMMIT_DATE,
+ COLUMN_MESSAGE,
+ COLUMN_FULL_MESSAGE,
+ COLUMN_FILE_LIST,
+ COLUMN_COUNT
+};
+
+enum {
+ FILE_COLUMN_FILE = 0,
+ FILE_COLUMN_PERCENTAGE,
+ FILE_COLUMN_CHANGES,
+ FILE_COLUMN_COUNT
+};
+
+static void
+tgh_log_dialog_init (TghLogDialog *dialog)
+{
+ GtkWidget *button;
+ GtkWidget *tree_view;
+ GtkWidget *text_view;
+ GtkWidget *file_view;
+ GtkWidget *scroll_window;
+ GtkWidget *pane;
+ GtkWidget *vpane;
+ GtkCellRenderer *renderer;
+ GtkTreeModel *model;
+
+ pane = gtk_vpaned_new ();
+
+ scroll_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ dialog->tree_view = tree_view = gtk_tree_view_new ();
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Revision"),
+ renderer, "text",
+ COLUMN_REVISION, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Author"),
+ renderer, "text",
+ COLUMN_AUTHOR, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("AuthorDate"),
+ renderer, "text",
+ COLUMN_AUTHOR_DATE, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Commit"),
+ renderer, "text",
+ COLUMN_COMMIT, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("CommitDate"),
+ renderer, "text",
+ COLUMN_COMMIT_DATE, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Message"),
+ renderer, "text",
+ COLUMN_MESSAGE, NULL);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER));
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
+
+ g_object_unref (model);
+
+ g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
+
+ gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
+ gtk_paned_pack1 (GTK_PANED(pane), scroll_window, TRUE, FALSE);
+ gtk_widget_show (tree_view);
+ gtk_widget_show (scroll_window);
+
+ scroll_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
+ vpane = gtk_vpaned_new ();
+
+ dialog->text_view = text_view = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD_CHAR);
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
+
+ gtk_container_add (GTK_CONTAINER (scroll_window), text_view);
+ gtk_paned_pack1 (GTK_PANED(vpane), scroll_window, TRUE, FALSE);
+ gtk_widget_show (text_view);
+ gtk_widget_show (scroll_window);
+
+ scroll_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ dialog->file_view = file_view = gtk_tree_view_new ();
+
+ renderer = gtk_cell_renderer_progress_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
+ -1, _("Changes"), renderer,
+ "value", FILE_COLUMN_PERCENTAGE,
+ "text", FILE_COLUMN_CHANGES,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
+ -1, _("File"),
+ renderer, "text",
+ FILE_COLUMN_FILE, NULL);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING));
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (file_view), model);
+
+ g_object_unref (model);
+
+ gtk_container_add (GTK_CONTAINER (scroll_window), file_view);
+ gtk_paned_pack2 (GTK_PANED(vpane), scroll_window, TRUE, FALSE);
+ gtk_widget_show (file_view);
+ gtk_widget_show (scroll_window);
+
+ gtk_paned_pack2 (GTK_PANED(pane), vpane, TRUE, FALSE);
+ gtk_widget_show (vpane);
+
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), pane, TRUE, TRUE, 0);
+ gtk_widget_show (pane);
+
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Log"));
+
+ gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
+
+ dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
+ gtk_widget_show (button);
+
+ dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
+ gtk_widget_hide (button);
+
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_widget_show (button);
+
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
+}
+
+GtkWidget*
+tgh_log_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
+{
+ TghLogDialog *dialog = g_object_new (TGH_TYPE_LOG_DIALOG, NULL);
+
+ if(title)
+ gtk_window_set_title (GTK_WINDOW(dialog), title);
+
+ if(parent)
+ gtk_window_set_transient_for (GTK_WINDOW(dialog), parent);
+
+ if(flags & GTK_DIALOG_MODAL)
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_NO_SEPARATOR)
+ gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
+
+ return GTK_WIDGET(dialog);
+}
+
+void
+tgh_log_dialog_add (TghLogDialog *dialog, GSList *files, const gchar *revision, const gchar *author, const gchar *author_date, const gchar *commit, const gchar *commit_date, const gchar *message)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar **lines = NULL;
+ gchar **line_iter;
+ gchar *first_line = NULL;
+
+ g_return_if_fail (TGH_IS_LOG_DIALOG (dialog));
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+
+ if(message)
+ {
+ lines = g_strsplit_set (message, "\r\n", -1);
+ line_iter = lines;
+ while (*line_iter)
+ {
+ if (g_strstrip (*line_iter)[0])
+ break;
+ line_iter++;
+ }
+ if (!line_iter)
+ line_iter = lines;
+ first_line = *line_iter;
+ }
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ COLUMN_REVISION, revision,
+ COLUMN_AUTHOR, author,
+ COLUMN_AUTHOR_DATE, author_date,
+ COLUMN_COMMIT, commit,
+ COLUMN_COMMIT_DATE, commit_date,
+ COLUMN_MESSAGE, first_line,
+ COLUMN_FULL_MESSAGE, message,
+ COLUMN_FILE_LIST, files,
+ -1);
+
+ g_strfreev (lines);
+}
+
+void
+tgh_log_dialog_done (TghLogDialog *dialog)
+{
+ g_return_if_fail (TGH_IS_LOG_DIALOG (dialog));
+
+ gtk_widget_hide (dialog->cancel);
+ gtk_widget_show (dialog->refresh);
+}
+
+static void
+selection_changed (GtkTreeView *tree_view, gpointer user_data)
+{
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ gchar *message;
+ GSList *files;
+
+ TghLogDialog *dialog = TGH_LOG_DIALOG (user_data);
+
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gtk_tree_model_get (model, &iter, COLUMN_FULL_MESSAGE, &message, COLUMN_FILE_LIST, &files, -1);
+ gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view)), message?message:"", -1);
+ g_free (message);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ while(files)
+ {
+ gchar *changes = g_strdup_printf ("+%u -%u", TGH_LOG_FILE (files->data)->insertions, TGH_LOG_FILE (files->data)->deletions);
+ guint sum = TGH_LOG_FILE (files->data)->insertions + TGH_LOG_FILE (files->data)->deletions;
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ FILE_COLUMN_FILE, TGH_LOG_FILE (files->data)->file,
+ FILE_COLUMN_PERCENTAGE, sum?TGH_LOG_FILE (files->data)->insertions * 100 / sum:0,
+ FILE_COLUMN_CHANGES, changes,
+ -1);
+ g_free (changes);
+ files = files->next;
+ }
+
+ gtk_tree_view_expand_all (GTK_TREE_VIEW (dialog->file_view));
+ }
+}
+
+static void
+cancel_clicked (GtkButton *button, gpointer user_data)
+{
+ TghLogDialog *dialog = TGH_LOG_DIALOG (user_data);
+
+ gtk_widget_hide (dialog->cancel);
+ gtk_widget_show (dialog->refresh);
+
+ g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
+}
+
+static void
+refresh_clicked (GtkButton *button, gpointer user_data)
+{
+ GtkTreeModel *model;
+ TghLogDialog *dialog = TGH_LOG_DIALOG (user_data);
+
+ gtk_widget_hide (dialog->refresh);
+ gtk_widget_show (dialog->cancel);
+
+ g_signal_emit (dialog, signals[SIGNAL_REFRESH], 0);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view)), "", -1);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+}
+
diff --git a/tvp-git-helper/tgh-log-dialog.h b/tvp-git-helper/tgh-log-dialog.h
new file mode 100644
index 0000000..11e4426
--- /dev/null
+++ b/tvp-git-helper/tgh-log-dialog.h
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __TGH_LOG_DIALOG_H__
+#define __TGH_LOG_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _TghLogDialogClass TghLogDialogClass;
+typedef struct _TghLogDialog TghLogDialog;
+
+#define TGH_TYPE_LOG_DIALOG (tgh_log_dialog_get_type ())
+#define TGH_LOG_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TGH_TYPE_LOG_DIALOG, TghLogDialog))
+#define TGH_LOG_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TGH_TYPE_LOG_DIALOG, TghLogDialogClass))
+#define TGH_IS_LOG_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TGH_TYPE_LOG_DIALOG))
+#define TGH_IS_LOG_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TGH_TYPE_LOG_DIALOG))
+#define TGH_LOG_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TGH_TYPE_LOG_DIALOG, TghLogDialogClass))
+
+typedef struct
+{
+ guint insertions;
+ guint deletions;
+ gchar *file;
+} TghLogFile;
+
+#define TGH_LOG_FILE(p) ((TghLogFile*)p)
+
+GType tgh_log_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tgh_log_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+void tgh_log_dialog_add (TghLogDialog *dialog,
+ GSList *files,
+ const gchar *revision,
+ const gchar *author,
+ const gchar *author_date,
+ const gchar *commit,
+ const gchar *commit_date,
+ const gchar *message);
+void tgh_log_dialog_done (TghLogDialog *dialog);
+
+G_END_DECLS;
+
+#endif /* !__TGH_LOG_DIALOG_H__ */
diff --git a/tvp-git-helper/tgh-branch.c b/tvp-git-helper/tgh-log.c
similarity index 60%
copy from tvp-git-helper/tgh-branch.c
copy to tvp-git-helper/tgh-log.c
index 2f489d7..f9d1918 100644
--- a/tvp-git-helper/tgh-branch.c
+++ b/tvp-git-helper/tgh-log.c
@@ -22,43 +22,52 @@
#include <stdlib.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#include <glib.h>
#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
+#include <thunar-vfs/thunar-vfs.h>
#include "tgh-common.h"
#include "tgh-dialog-common.h"
-#include "tgh-branch-dialog.h"
-
-#include "tgh-branch.h"
+#include "tgh-log-dialog.h"
-static gchar *argv[] = {"git", "branch", NULL};
-
-struct proc_args
-{
- GtkWidget *dialog;
- gchar *error;
- gchar **files;
-};
+#include "tgh-log.h"
-gboolean branch_spawn (TghBranchDialog *dialog, GPid *pid)
+static gboolean log_spawn (TghLogDialog *dialog, gchar **files, GPid *pid)
{
GError *error = NULL;
- gint fd_out;
- gint fd_err;
- GIOChannel *chan_out;
- GIOChannel *chan_err;
+ gint fd_out, fd_err;
+ GIOChannel *chan_out, *chan_err;
TghOutputParser *parser;
+ gsize length;
+ gint i;
+ gchar **argv;
+
+ length = 7;
+ if(files)
+ length += g_strv_length(files);
+
+ argv = g_new(gchar*, length);
+
+ argv[0] = "git";
+ argv[1] = "log";
+ argv[2] = "--numstat";
+ argv[3] = "--pretty=fuller";
+ argv[4] = "--boundary";
+ argv[5] = "--";
+ argv[length-1] = NULL;
+
+ i = 6;
+ if(files)
+ while(*files)
+ argv[i++] = *files++;
if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
{
+ g_free (argv);
return FALSE;
}
+ g_free (argv);
parser = tgh_error_parser_new(GTK_WIDGET(dialog));
@@ -66,34 +75,43 @@ gboolean branch_spawn (TghBranchDialog *dialog, GPid *pid)
chan_out = g_io_channel_unix_new(fd_out);
chan_err = g_io_channel_unix_new(fd_err);
- g_io_add_watch(chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_branch_parser_new(GTK_WIDGET(dialog)));
+ g_io_add_watch(chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_log_parser_new(GTK_WIDGET(dialog)));
g_io_add_watch(chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
return TRUE;
}
-static void create_branch_child(TghBranchDialog *dialog, gpointer user_data)
+static void create_log_child(TghLogDialog *dialog, gpointer user_data)
{
GPid pid;
- if (branch_spawn(dialog, &pid))
+ if (log_spawn(dialog, user_data, &pid))
tgh_replace_child(TRUE, pid);
else
- tgh_branch_dialog_done(dialog);
+ tgh_log_dialog_done(dialog);
}
-gboolean tgh_branch (gchar **files, GPid *pid)
+gboolean tgh_log (gchar **files, GPid *pid)
{
GtkWidget *dialog;
- dialog = tgh_branch_dialog_new (NULL, NULL, 0);
+ dialog = tgh_log_dialog_new (NULL, NULL, 0);
g_signal_connect(dialog, "cancel-clicked", tgh_cancel, NULL);
tgh_dialog_start (GTK_DIALOG (dialog), TRUE);
- g_signal_connect(dialog, "refresh-clicked", G_CALLBACK(create_branch_child), NULL);
+ g_signal_connect(dialog, "refresh-clicked", G_CALLBACK(create_log_child), files);
if (files)
- chdir(files[0]);
-
- return branch_spawn(TGH_BRANCH_DIALOG(dialog), pid);
+ if (chdir(files[0]))
+ {
+ gchar *dirname = g_path_get_dirname (files[0]);
+ if (chdir(dirname))
+ {
+ g_free (dirname);
+ return FALSE;
+ }
+ g_free (dirname);
+ }
+
+ return log_spawn(TGH_LOG_DIALOG(dialog), files, pid);
}
diff --git a/tvp-git-helper/tgh-add.h b/tvp-git-helper/tgh-log.h
similarity index 87%
copy from tvp-git-helper/tgh-add.h
copy to tvp-git-helper/tgh-log.h
index 618b78b..4dc7265 100644
--- a/tvp-git-helper/tgh-add.h
+++ b/tvp-git-helper/tgh-log.h
@@ -14,14 +14,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __TGH_ADD_H__
-#define __TGH_ADD_H__
+#ifndef __TGH_LOG_H__
+#define __TGH_LOG_H__
G_BEGIN_DECLS
-gboolean tgh_add (gchar **, GPid *);
+gboolean tgh_log (gchar**, GPid*);
G_END_DECLS
-#endif /*__TGH_ADD_H__*/
+#endif /*__TGH_LOG_H__*/
diff --git a/tvp-git-helper/tgh-move.c b/tvp-git-helper/tgh-move.c
new file mode 100644
index 0000000..9b8cd6b
--- /dev/null
+++ b/tvp-git-helper/tgh-move.c
@@ -0,0 +1,157 @@
+/*-
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "tgh-common.h"
+#include "tgh-dialog-common.h"
+#include "tgh-notify-dialog.h"
+
+#include "tgh-move.h"
+
+struct exit_args
+{
+ TghOutputParser *parser;
+ GtkWidget *dialog;
+};
+
+static void child_exit (GPid pid, gint status, gpointer user_data)
+{
+ struct exit_args *args = user_data;
+
+ gtk_widget_destroy (args->dialog);
+
+ if (WEXITSTATUS (status) <= 1)
+ {
+ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Move finished"));
+ tgh_dialog_start (GTK_DIALOG (dialog), TRUE);
+ }
+
+ tgh_child_exit (pid, status, args->parser);
+
+ g_free (args);
+}
+
+static gboolean move_spawn (GtkWidget *dialog, gchar **files, gchar *dest, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_err;
+ GIOChannel *chan_err;
+ TghOutputParser *parser;
+ gsize length;
+ gint i;
+ gchar **argv;
+ struct exit_args *args;
+
+ length = 4;
+ length += g_strv_length (files);
+
+ argv = g_new (gchar*, length);
+
+ argv[0] = "git";
+ argv[1] = "mv";
+ argv[length-1] = NULL;
+
+ i = 2;
+ while (*files)
+ argv[i++] = *files++;
+
+ argv[i] = dest;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (NULL);
+
+ args = g_new (struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
+
+ g_child_watch_add (*pid, (GChildWatchFunc)child_exit, args);
+
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+gboolean tgh_move (gchar **files, GPid *pid)
+{
+ GtkWidget *dialog;
+ gchar *to;
+ gboolean multiple = FALSE;
+
+ if (files && files[0] && files[1])
+ multiple = TRUE;
+
+ if (files)
+ if (chdir (files[0]))
+ {
+ gchar *dirname = g_path_get_dirname (files[0]);
+ if (chdir (dirname))
+ {
+ g_free (dirname);
+ return FALSE;
+ }
+ g_free (dirname);
+ }
+
+ dialog = gtk_file_chooser_dialog_new (_("Move To"), NULL,
+ multiple?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
+
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+ {
+ gtk_widget_destroy (dialog);
+ return FALSE;
+ }
+
+ to = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+ gtk_widget_destroy (dialog);
+
+ dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CANCEL, _("Move ..."));
+ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (tgh_cancel), NULL);
+ tgh_dialog_start (GTK_DIALOG (dialog), TRUE);
+
+ return move_spawn (dialog, files, to, pid);
+}
+
diff --git a/tvp-git-helper/tgh-add.h b/tvp-git-helper/tgh-move.h
similarity index 87%
copy from tvp-git-helper/tgh-add.h
copy to tvp-git-helper/tgh-move.h
index 618b78b..9947c00 100644
--- a/tvp-git-helper/tgh-add.h
+++ b/tvp-git-helper/tgh-move.h
@@ -14,14 +14,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __TGH_ADD_H__
-#define __TGH_ADD_H__
+#ifndef __TGH_MOVE_H__
+#define __TGH_MOVE_H__
G_BEGIN_DECLS
-gboolean tgh_add (gchar **, GPid *);
+gboolean tgh_move (gchar **, GPid *);
G_END_DECLS
-#endif /*__TGH_ADD_H__*/
+#endif /*__TGH_MOVE_H__*/
diff --git a/tvp-git-helper/tgh-reset-dialog.c b/tvp-git-helper/tgh-notify-dialog.c
similarity index 81%
rename from tvp-git-helper/tgh-reset-dialog.c
rename to tvp-git-helper/tgh-notify-dialog.c
index 539bea8..5b0cb41 100644
--- a/tvp-git-helper/tgh-reset-dialog.c
+++ b/tvp-git-helper/tgh-notify-dialog.c
@@ -24,11 +24,11 @@
#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
-#include "tgh-reset-dialog.h"
+#include "tgh-notify-dialog.h"
static void cancel_clicked (GtkButton*, gpointer);
-struct _TghResetDialog
+struct _TghNotifyDialog
{
GtkDialog dialog;
@@ -37,12 +37,12 @@ struct _TghResetDialog
GtkWidget *cancel;
};
-struct _TghResetDialogClass
+struct _TghNotifyDialogClass
{
GtkDialogClass dialog_class;
};
-G_DEFINE_TYPE (TghResetDialog, tgh_reset_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (TghNotifyDialog, tgh_notify_dialog, GTK_TYPE_DIALOG)
enum {
SIGNAL_CANCEL = 0,
@@ -52,7 +52,7 @@ enum {
static guint signals[SIGNAL_COUNT];
static void
-tgh_reset_dialog_class_init (TghResetDialogClass *klass)
+tgh_notify_dialog_class_init (TghNotifyDialogClass *klass)
{
signals[SIGNAL_CANCEL] = g_signal_new("cancel-clicked",
G_OBJECT_CLASS_TYPE (klass),
@@ -63,13 +63,13 @@ tgh_reset_dialog_class_init (TghResetDialogClass *klass)
}
enum {
- COLUMN_PATH = 0,
- COLUMN_STAT,
+ COLUMN_ACTION = 0,
+ COLUMN_PATH,
COLUMN_COUNT
};
static void
-tgh_reset_dialog_init (TghResetDialog *dialog)
+tgh_notify_dialog_init (TghNotifyDialog *dialog)
{
GtkWidget *button;
GtkWidget *tree_view;
@@ -84,15 +84,15 @@ tgh_reset_dialog_init (TghResetDialog *dialog)
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
- -1, _("Path"),
+ -1, _("Action"),
renderer, "text",
- COLUMN_PATH, NULL);
+ COLUMN_ACTION, NULL);
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
- -1, _("Status"),
+ -1, _("Path"),
renderer, "text",
- COLUMN_STAT, NULL);
+ COLUMN_PATH, NULL);
model = GTK_TREE_MODEL (gtk_list_store_new (COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING));
@@ -105,7 +105,7 @@ tgh_reset_dialog_init (TghResetDialog *dialog)
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
- gtk_window_set_title (GTK_WINDOW (dialog), _("Reset"));
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Notify"));
dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
@@ -119,9 +119,9 @@ tgh_reset_dialog_init (TghResetDialog *dialog)
}
GtkWidget*
-tgh_reset_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
+tgh_notify_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
{
- TghResetDialog *dialog = g_object_new (TGH_TYPE_RESET_DIALOG, NULL);
+ TghNotifyDialog *dialog = g_object_new (TGH_TYPE_NOTIFY_DIALOG, NULL);
if(title)
gtk_window_set_title (GTK_WINDOW(dialog), title);
@@ -142,20 +142,20 @@ tgh_reset_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flag
}
void
-tgh_reset_dialog_add (TghResetDialog *dialog, const gchar *file, const gchar *state)
+tgh_notify_dialog_add (TghNotifyDialog *dialog, const gchar *action, const gchar *file)
{
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *path;
- g_return_if_fail (TGH_IS_RESET_DIALOG (dialog));
+ g_return_if_fail (TGH_IS_NOTIFY_DIALOG (dialog));
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ COLUMN_ACTION, action,
COLUMN_PATH, file,
- COLUMN_STAT, state,
-1);
path = gtk_tree_model_get_path (model, &iter);
@@ -165,9 +165,9 @@ tgh_reset_dialog_add (TghResetDialog *dialog, const gchar *file, const gchar *st
}
void
-tgh_reset_dialog_done (TghResetDialog *dialog)
+tgh_notify_dialog_done (TghNotifyDialog *dialog)
{
- g_return_if_fail (TGH_IS_RESET_DIALOG (dialog));
+ g_return_if_fail (TGH_IS_NOTIFY_DIALOG (dialog));
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
@@ -176,7 +176,7 @@ tgh_reset_dialog_done (TghResetDialog *dialog)
static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
- TghResetDialog *dialog = TGH_RESET_DIALOG (user_data);
+ TghNotifyDialog *dialog = TGH_NOTIFY_DIALOG (user_data);
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
diff --git a/tvp-git-helper/tgh-notify-dialog.h b/tvp-git-helper/tgh-notify-dialog.h
new file mode 100644
index 0000000..a05c488
--- /dev/null
+++ b/tvp-git-helper/tgh-notify-dialog.h
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __TGH_NOTIFY_DIALOG_H__
+#define __TGH_NOTIFY_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _TghNotifyDialogClass TghNotifyDialogClass;
+typedef struct _TghNotifyDialog TghNotifyDialog;
+
+#define TGH_TYPE_NOTIFY_DIALOG (tgh_notify_dialog_get_type ())
+#define TGH_NOTIFY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TGH_TYPE_NOTIFY_DIALOG, TghNotifyDialog))
+#define TGH_NOTIFY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TGH_TYPE_NOTIFY_DIALOG, TghNotifyDialogClass))
+#define TGH_IS_NOTIFY_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TGH_TYPE_NOTIFY_DIALOG))
+#define TGH_IS_NOTIFY_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TGH_TYPE_NOTIFY_DIALOG))
+#define TGH_NOTIFY_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TGH_TYPE_NOTIFY_DIALOG, TghNotifyDialogClass))
+
+GType tgh_notify_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tgh_notify_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+void tgh_notify_dialog_add (TghNotifyDialog *dialog,
+ const gchar *action,
+ const gchar *path);
+void tgh_notify_dialog_done (TghNotifyDialog *dialog);
+
+G_END_DECLS;
+
+#endif /* !__TGH_NOTIFY_DIALOG_H__ */
diff --git a/tvp-git-helper/tgh-reset-dialog.h b/tvp-git-helper/tgh-reset-dialog.h
deleted file mode 100644
index b1324ce..0000000
--- a/tvp-git-helper/tgh-reset-dialog.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __TGH_RESET_DIALOG_H__
-#define __TGH_RESET_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _TghResetDialogClass TghResetDialogClass;
-typedef struct _TghResetDialog TghResetDialog;
-
-#define TGH_TYPE_RESET_DIALOG (tgh_reset_dialog_get_type ())
-#define TGH_RESET_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TGH_TYPE_RESET_DIALOG, TghResetDialog))
-#define TGH_RESET_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TGH_TYPE_RESET_DIALOG, TghResetDialogClass))
-#define TGH_IS_RESET_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TGH_TYPE_RESET_DIALOG))
-#define TGH_IS_RESET_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TGH_TYPE_RESET_DIALOG))
-#define TGH_RESET_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TGH_TYPE_RESET_DIALOG, TghResetDialogClass))
-
-GType tgh_reset_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
-
-GtkWidget* tgh_reset_dialog_new (const gchar *title,
- GtkWindow *parent,
- GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
-
-void tgh_reset_dialog_add (TghResetDialog *dialog,
- const gchar *path,
- const gchar *action);
-void tgh_reset_dialog_done (TghResetDialog *dialog);
-
-G_END_DECLS;
-
-#endif /* !__TGH_RESET_DIALOG_H__ */
diff --git a/tvp-git-helper/tgh-reset.c b/tvp-git-helper/tgh-reset.c
index cbc6378..49035f5 100644
--- a/tvp-git-helper/tgh-reset.c
+++ b/tvp-git-helper/tgh-reset.c
@@ -22,6 +22,14 @@
#include <stdlib.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
#include <glib.h>
#include <gtk/gtk.h>
@@ -30,89 +38,74 @@
#include "tgh-common.h"
#include "tgh-dialog-common.h"
#include "tgh-file-selection-dialog.h"
-#include "tgh-reset-dialog.h"
#include "tgh-reset.h"
-typedef struct
+struct exit_args
{
- TghOutputParser parent;
+ TghOutputParser *parser;
GtkWidget *dialog;
-} ResetParser;
+};
-static void reset_parser_func(ResetParser *parser, gchar *line)
+static void child_exit(GPid pid, gint status, gpointer user_data)
{
- TghResetDialog *dialog = TGH_RESET_DIALOG(parser->dialog);
- if(line)
- {
- gchar *file = line;
- gchar *state = strchr(line, ':');
- if(state)
- {
- *state++ = '\0';
- state = g_strstrip(state);
- }
- else
- {
- state = "";
- file = g_strstrip(file);
- }
+ struct exit_args *args = user_data;
- tgh_reset_dialog_add(dialog, file, state);
- }
- else
+ gtk_widget_destroy(args->dialog);
+
+ if(WEXITSTATUS(status) <= 1)
{
- tgh_reset_dialog_done(dialog);
- g_free(parser);
+ GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Reset finished"));
+ tgh_dialog_start(GTK_DIALOG(dialog), TRUE);
}
-}
-
-TghOutputParser* reset_parser_new(GtkWidget *dialog)
-{
- ResetParser *parser = g_new(ResetParser, 1);
- TGH_OUTPUT_PARSER(parser)->parse = TGH_OUTPUT_PARSER_FUNC(reset_parser_func);
+ tgh_child_exit(pid, status, args->parser);
- parser->dialog = dialog;
-
- return TGH_OUTPUT_PARSER(parser);
+ g_free(args);
}
-gboolean reset_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
+static gboolean reset_spawn (GtkWidget *dialog, gchar **files, GPid *pid)
{
GError *error = NULL;
- gint fd_out, fd_err;
- GIOChannel *chan_out, *chan_err;
+ gint fd_err;
+ GIOChannel *chan_err;
TghOutputParser *parser;
gsize length;
gint i;
gchar **argv;
+ struct exit_args *args;
- length = 3;
+ length = 5;
length += g_strv_length(files);
argv = g_new(gchar*, length);
argv[0] = "git";
argv[1] = "reset";
+ argv[2] = "-q";
+ argv[3] = "--";
argv[length-1] = NULL;
- i = 2;
+ i = 4;
while(*files)
argv[i++] = *files++;
- if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
+ if(!g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
{
+ g_free (argv);
return FALSE;
}
+ g_free (argv);
+
+ parser = tgh_error_parser_new(NULL);
- parser = tgh_error_parser_new(GTK_WIDGET(dialog));
+ args = g_new(struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
- g_child_watch_add(*pid, (GChildWatchFunc)tgh_child_exit, parser);
+ g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
- chan_out = g_io_channel_unix_new(fd_out);
chan_err = g_io_channel_unix_new(fd_err);
- g_io_add_watch(chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, reset_parser_new(dialog));
g_io_add_watch(chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
return TRUE;
@@ -122,8 +115,20 @@ gboolean tgh_reset (gchar **files, GPid *pid)
{
GtkWidget *dialog;
- dialog = tgh_file_selection_dialog_new (_("Reset"), NULL, 0, files, TGH_FILE_SELECTION_FLAG_ADDED);
- if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
+ if (files)
+ if (chdir(files[0]))
+ {
+ gchar *dirname = g_path_get_dirname (files[0]);
+ if (chdir(dirname))
+ {
+ g_free (dirname);
+ return FALSE;
+ }
+ g_free (dirname);
+ }
+
+ dialog = tgh_file_selection_dialog_new (_("Reset"), NULL, 0, TGH_FILE_SELECTION_FLAG_ADDED);
+ if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
{
gtk_widget_destroy (dialog);
return FALSE;
@@ -132,13 +137,13 @@ gboolean tgh_reset (gchar **files, GPid *pid)
files = tgh_file_selection_dialog_get_files (TGH_FILE_SELECTION_DIALOG (dialog));
gtk_widget_destroy (dialog);
- if(!files)
+ if (!files)
return FALSE;
- dialog = tgh_reset_dialog_new(NULL, NULL, 0);
- g_signal_connect(dialog, "cancel-clicked", tgh_cancel, NULL);
- tgh_dialog_start (GTK_DIALOG (dialog), TRUE);
+ dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CANCEL, _("Reset ..."));
+ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (tgh_cancel), NULL);
+ tgh_dialog_start (GTK_DIALOG(dialog), TRUE);
- return reset_spawn(dialog, files, pid);
+ return reset_spawn (dialog, files, pid);
}
diff --git a/tvp-git-helper/tgh-stash-dialog.c b/tvp-git-helper/tgh-stash-dialog.c
new file mode 100644
index 0000000..d51a804
--- /dev/null
+++ b/tvp-git-helper/tgh-stash-dialog.c
@@ -0,0 +1,618 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs.h>
+#include <gtk/gtk.h>
+
+#include "tgh-common.h"
+#include "tgh-stash-dialog.h"
+
+static void selection_changed (GtkTreeView*, gpointer);
+static void cancel_clicked (GtkButton*, gpointer);
+static void save_clicked (GtkButton*, gpointer);
+static void apply_clicked (GtkButton*, gpointer);
+static void pop_clicked (GtkButton*, gpointer);
+static void drop_clicked (GtkButton*, gpointer);
+static void clear_clicked (GtkButton*, gpointer);
+static void tgh_make_homogeneous (GtkWidget *, ...) G_GNUC_NULL_TERMINATED;
+
+struct _TghStashDialog
+{
+ GtkDialog dialog;
+
+ GtkWidget *tree_view;
+ GtkWidget *file_view;
+ GtkWidget *save;
+ GtkWidget *apply;
+ GtkWidget *pop;
+ GtkWidget *drop;
+ GtkWidget *close;
+ GtkWidget *clear;
+ GtkWidget *cancel;
+};
+
+struct _TghStashDialogClass
+{
+ GtkDialogClass dialog_class;
+};
+
+G_DEFINE_TYPE (TghStashDialog, tgh_stash_dialog, GTK_TYPE_DIALOG)
+
+enum {
+ SIGNAL_CANCEL = 0,
+ SIGNAL_SAVE,
+ SIGNAL_APPLY,
+ SIGNAL_POP,
+ SIGNAL_DROP,
+ SIGNAL_CLEAR,
+ SIGNAL_SHOW,
+ SIGNAL_COUNT
+};
+
+static guint signals[SIGNAL_COUNT];
+
+static void
+tgh_stash_dialog_class_init (TghStashDialogClass *klass)
+{
+ signals[SIGNAL_CANCEL] = g_signal_new("cancel-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ signals[SIGNAL_SAVE] = g_signal_new("save-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ signals[SIGNAL_APPLY] = g_signal_new("apply-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ signals[SIGNAL_POP] = g_signal_new("pop-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ signals[SIGNAL_DROP] = g_signal_new("drop-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ signals[SIGNAL_CLEAR] = g_signal_new("clear-clicked",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ signals[SIGNAL_SHOW] = g_signal_new("selection-changed",
+ G_OBJECT_CLASS_TYPE (klass),
+ G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ 0, NULL, NULL,
+ g_cclosure_marshal_VOID__STRING,
+ G_TYPE_NONE, 1, G_TYPE_STRING);
+}
+
+enum {
+ COLUMN_NAME = 0,
+ COLUMN_BRANCH,
+ COLUMN_DESCRIPTION,
+ COLUMN_COUNT
+};
+
+enum {
+ FILE_COLUMN_FILE = 0,
+ FILE_COLUMN_PERCENTAGE,
+ FILE_COLUMN_CHANGES,
+ FILE_COLUMN_COUNT
+};
+
+static void
+tgh_stash_dialog_init (TghStashDialog *dialog)
+{
+ GtkWidget *button;
+ GtkWidget *tree_view;
+ GtkWidget *file_view;
+ GtkWidget *scroll_window;
+ GtkWidget *vpane;
+ GtkWidget *box;
+ GtkCellRenderer *renderer;
+ GtkTreeModel *model;
+
+ vpane = gtk_vpaned_new ();
+
+ scroll_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ dialog->tree_view = tree_view = gtk_tree_view_new ();
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Name"), renderer,
+ "text", COLUMN_NAME,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Branch"), renderer,
+ "text", COLUMN_BRANCH,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, _("Description"), renderer,
+ "text", COLUMN_DESCRIPTION,
+ NULL);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (COLUMN_COUNT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING));
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
+
+ g_object_unref (model);
+
+ g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
+
+ gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
+ gtk_paned_pack1 (GTK_PANED(vpane), scroll_window, TRUE, FALSE);
+ gtk_widget_show (tree_view);
+ gtk_widget_show (scroll_window);
+
+ scroll_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
+ dialog->file_view = file_view = gtk_tree_view_new ();
+
+ renderer = gtk_cell_renderer_progress_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
+ -1, _("Changes"), renderer,
+ "value", FILE_COLUMN_PERCENTAGE,
+ "text", FILE_COLUMN_CHANGES,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
+ -1, _("File"),
+ renderer, "text",
+ FILE_COLUMN_FILE, NULL);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new (FILE_COLUMN_COUNT, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING));
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (file_view), model);
+
+ g_object_unref (model);
+
+ gtk_container_add (GTK_CONTAINER (scroll_window), file_view);
+ gtk_paned_pack2 (GTK_PANED(vpane), scroll_window, TRUE, FALSE);
+ gtk_widget_show (file_view);
+ gtk_widget_show (scroll_window);
+
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vpane, TRUE, TRUE, 0);
+ gtk_widget_show (vpane);
+
+ //gtk_button_box_set_layout(GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), GTK_BUTTONBOX_EDGE);
+ gtk_container_remove (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), GTK_DIALOG (dialog)->action_area);
+
+ GTK_DIALOG (dialog)->action_area = box = gtk_hbox_new (FALSE, 0);
+
+ gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox), box,
+ FALSE, TRUE, 0);
+ gtk_widget_show (box);
+
+ gtk_box_reorder_child (GTK_BOX (GTK_DIALOG (dialog)->vbox), box, 0);
+
+ //box = gtk_hbox_new (FALSE, 12);
+
+ dialog->save = button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (save_clicked), dialog);
+ gtk_widget_show (button);
+
+ dialog->apply = button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (apply_clicked), dialog);
+ gtk_widget_show (button);
+
+ dialog->pop = button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (pop_clicked), dialog);
+ gtk_widget_show (button);
+
+ dialog->drop = button = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (drop_clicked), dialog);
+ gtk_widget_show (button);
+
+ dialog->clear = button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (clear_clicked), dialog);
+ gtk_widget_show (button);
+
+ //gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), box, FALSE, TRUE, 0);
+ //gtk_widget_show (box);
+
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Stash"));
+
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_widget_hide (button);
+
+ dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, FALSE, TRUE, 0);
+ g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
+ gtk_widget_show (button);
+
+ tgh_make_homogeneous (dialog->save, dialog->apply, dialog->pop, dialog->drop, dialog->close, dialog->cancel, NULL);
+
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
+}
+
+GtkWidget*
+tgh_stash_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
+{
+ TghStashDialog *dialog = g_object_new (TGH_TYPE_STASH_DIALOG, NULL);
+
+ if(title)
+ gtk_window_set_title (GTK_WINDOW(dialog), title);
+
+ if(parent)
+ gtk_window_set_transient_for (GTK_WINDOW(dialog), parent);
+
+ if(flags & GTK_DIALOG_MODAL)
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_NO_SEPARATOR)
+ gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
+
+ return GTK_WIDGET(dialog);
+}
+
+static void
+tgh_make_homogeneous (GtkWidget *first, ...)
+{
+ GtkWidget *iter;
+ GtkRequisition request;
+ gint max_width = 0;
+ gint max_height = 0;
+ va_list ap;
+
+ va_start (ap, first);
+ iter = first;
+ while (iter)
+ {
+ gtk_widget_size_request(iter, &request);
+ if (request.width > max_width)
+ max_width = request.width;
+ if (request.height > max_height)
+ max_height = request.height;
+ iter = va_arg (ap, GtkWidget *);
+ }
+ va_end (ap);
+
+ va_start (ap, first);
+ iter = first;
+ while (iter)
+ {
+ gtk_widget_set_size_request (iter, max_width, max_height);
+ iter = va_arg (ap, GtkWidget *);
+ }
+ va_end (ap);
+}
+
+void
+tgh_stash_dialog_add (TghStashDialog *dialog, const gchar *name, const gchar *branch, const gchar *description)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ g_return_if_fail (TGH_IS_STASH_DIALOG (dialog));
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ COLUMN_NAME, name,
+ COLUMN_BRANCH, branch,
+ COLUMN_DESCRIPTION, description,
+ -1);
+}
+
+void
+tgh_stash_dialog_add_file (TghStashDialog *dialog, guint insertions, guint deletions, const gchar *file)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ gchar *changes;
+ guint sum;
+
+ g_return_if_fail (TGH_IS_STASH_DIALOG (dialog));
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+
+ changes = g_strdup_printf ("+%u -%u", insertions, deletions);
+ sum = insertions + deletions;
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ FILE_COLUMN_FILE, file,
+ FILE_COLUMN_PERCENTAGE, sum?insertions * 100 / sum:0,
+ FILE_COLUMN_CHANGES, changes,
+ -1);
+ g_free (changes);
+}
+
+void
+tgh_stash_dialog_done (TghStashDialog *dialog)
+{
+ g_return_if_fail (TGH_IS_STASH_DIALOG (dialog));
+
+ gtk_widget_hide (dialog->cancel);
+ gtk_widget_show (dialog->close);
+}
+
+static void
+selection_changed (GtkTreeView *tree_view, gpointer user_data)
+{
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ gchar *name;
+
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gtk_tree_model_get (model, &iter, COLUMN_NAME, &name, -1);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ gtk_widget_hide (dialog->cancel);
+ gtk_widget_show (dialog->close);
+
+ g_signal_emit (dialog, signals[SIGNAL_SHOW], 0, name);
+
+ g_free (name);
+ }
+}
+
+static void
+cancel_clicked (GtkButton *button, gpointer user_data)
+{
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+
+ gtk_widget_hide (dialog->cancel);
+ gtk_widget_show (dialog->close);
+
+ g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
+}
+
+static void
+save_clicked (GtkButton *button, gpointer user_data)
+{
+ GtkTreeModel *model;
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+ GtkWidget *name_dialog;
+ GtkWidget *label, *image, *hbox, *vbox, *desc_entry;
+ gchar *name;
+ gint result;
+
+ name_dialog = gtk_dialog_new_with_buttons (NULL, GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
+ gtk_window_set_resizable (GTK_WINDOW (name_dialog), FALSE);
+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (name_dialog), TRUE);
+
+ label = gtk_label_new (_("Stash description:"));
+ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+ gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
+
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+
+ desc_entry = gtk_entry_new ();
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ vbox = gtk_vbox_new (FALSE, 12);
+
+ gtk_box_pack_start (GTK_BOX (vbox), label,
+ FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (vbox), desc_entry,
+ TRUE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (hbox), image,
+ FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (hbox), vbox,
+ TRUE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (name_dialog))),
+ hbox,
+ FALSE, FALSE, 0);
+
+ gtk_container_set_border_width (GTK_CONTAINER (name_dialog), 5);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (name_dialog)->vbox), 14); /* 14 + 2 * 5 = 24 */
+ gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 5);
+ gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (name_dialog))), 6);
+
+ gtk_widget_show_all (hbox);
+
+ result = gtk_dialog_run (GTK_DIALOG (name_dialog));
+ if (result != GTK_RESPONSE_ACCEPT)
+ {
+ gtk_widget_destroy (name_dialog);
+ return;
+ }
+
+ name = g_strdup (gtk_entry_get_text (GTK_ENTRY (desc_entry)));
+
+ gtk_widget_destroy (name_dialog);
+
+ gtk_widget_hide (dialog->close);
+ gtk_widget_show (dialog->cancel);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_SAVE], 0, name);
+
+ g_free (name);
+}
+
+static void
+apply_clicked (GtkButton *button, gpointer user_data)
+{
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ gchar *name;
+
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gtk_tree_model_get (model, &iter, COLUMN_NAME, &name, -1);
+
+ gtk_widget_hide (dialog->close);
+ gtk_widget_show (dialog->cancel);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_APPLY], 0, name);
+
+ g_free (name);
+ }
+}
+
+static void
+pop_clicked (GtkButton *button, gpointer user_data)
+{
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ gchar *name;
+
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gtk_tree_model_get (model, &iter, COLUMN_NAME, &name, -1);
+
+ gtk_widget_hide (dialog->close);
+ gtk_widget_show (dialog->cancel);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_POP], 0, name);
+
+ g_free (name);
+ }
+}
+
+static void
+drop_clicked (GtkButton *button, gpointer user_data)
+{
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
+ gchar *name;
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+ GtkWidget *sure_dialog;
+ gint result;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
+
+ if (gtk_tree_selection_get_selected (selection, &model, &iter))
+ {
+ gtk_tree_model_get (model, &iter, COLUMN_NAME, &name, -1);
+
+ sure_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Are you sure you want to drop %s?"), name);
+ result = gtk_dialog_run (GTK_DIALOG (sure_dialog));
+ gtk_widget_destroy (sure_dialog);
+ if (result != GTK_RESPONSE_YES)
+ return;
+
+ gtk_widget_hide (dialog->close);
+ gtk_widget_show (dialog->cancel);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_DROP], 0, name);
+
+ g_free (name);
+ }
+}
+
+static void
+clear_clicked (GtkButton *button, gpointer user_data)
+{
+ GtkTreeModel *model;
+ TghStashDialog *dialog = TGH_STASH_DIALOG (user_data);
+ GtkWidget *sure_dialog;
+ gint result;
+
+ sure_dialog = gtk_message_dialog_new (GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Are you sure you want to clear all stash?"));
+ result = gtk_dialog_run (GTK_DIALOG (sure_dialog));
+ gtk_widget_destroy (sure_dialog);
+ if (result != GTK_RESPONSE_YES)
+ return;
+
+ gtk_widget_hide (dialog->close);
+ gtk_widget_show (dialog->cancel);
+
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
+ gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_CLEAR], 0);
+}
+
diff --git a/tvp-git-helper/tgh-stash-dialog.h b/tvp-git-helper/tgh-stash-dialog.h
new file mode 100644
index 0000000..567297e
--- /dev/null
+++ b/tvp-git-helper/tgh-stash-dialog.h
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __TGH_STASH_DIALOG_H__
+#define __TGH_STASH_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _TghStashDialogClass TghStashDialogClass;
+typedef struct _TghStashDialog TghStashDialog;
+
+#define TGH_TYPE_STASH_DIALOG (tgh_stash_dialog_get_type ())
+#define TGH_STASH_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TGH_TYPE_STASH_DIALOG, TghStashDialog))
+#define TGH_STASH_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TGH_TYPE_STASH_DIALOG, TghStashDialogClass))
+#define TGH_IS_STASH_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TGH_TYPE_STASH_DIALOG))
+#define TGH_IS_STASH_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TGH_TYPE_STASH_DIALOG))
+#define TGH_STASH_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TGH_TYPE_STASH_DIALOG, TghStashDialogClass))
+
+GType tgh_stash_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tgh_stash_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+void tgh_stash_dialog_add (TghStashDialog *dialog,
+ const gchar *name,
+ const gchar *branch,
+ const gchar *description);
+void tgh_stash_dialog_add_file (TghStashDialog *dialog,
+ guint insertions,
+ guint deletions,
+ const gchar *file);
+void tgh_stash_dialog_done (TghStashDialog *dialog);
+
+G_END_DECLS;
+
+#endif /* !__TGH_STASH_DIALOG_H__ */
diff --git a/tvp-git-helper/tgh-stash.c b/tvp-git-helper/tgh-stash.c
new file mode 100644
index 0000000..ee87cd9
--- /dev/null
+++ b/tvp-git-helper/tgh-stash.c
@@ -0,0 +1,377 @@
+/*-
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "tgh-common.h"
+#include "tgh-dialog-common.h"
+#include "tgh-stash-dialog.h"
+
+#include "tgh-stash.h"
+
+struct exit_args
+{
+ TghOutputParser *parser;
+ TghStashDialog *dialog;
+};
+
+static gboolean stash_list_spawn (TghStashDialog *dialog, GPid *pid);
+
+static void child_exit (GPid pid, gint status, gpointer user_data)
+{
+ struct exit_args *args = user_data;
+
+ tgh_child_exit (pid, status, args->parser);
+
+ if (stash_list_spawn (args->dialog, &pid))
+ tgh_replace_child (TRUE, pid);
+ else
+ tgh_stash_dialog_done (args->dialog);
+
+ g_free (args);
+}
+
+static gchar *argv_list[] = {"git", "stash", "list", NULL};
+static gchar *argv_clear[] = {"git", "stash", "clear", NULL};
+
+static gboolean stash_list_spawn (TghStashDialog *dialog, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_out, fd_err;
+ GIOChannel *chan_out, *chan_err;
+ TghOutputParser *parser;
+
+ if(!g_spawn_async_with_pipes(NULL, argv_list, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
+ {
+ return FALSE;
+ }
+
+ parser = tgh_error_parser_new(GTK_WIDGET(dialog));
+
+ g_child_watch_add(*pid, (GChildWatchFunc)tgh_child_exit, parser);
+
+ chan_out = g_io_channel_unix_new(fd_out);
+ chan_err = g_io_channel_unix_new(fd_err);
+ g_io_add_watch(chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_stash_list_parser_new(GTK_WIDGET(dialog)));
+ g_io_add_watch(chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static gboolean stash_show_spawn (TghStashDialog *dialog, const gchar *name, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_out, fd_err;
+ GIOChannel *chan_out, *chan_err;
+ TghOutputParser *parser;
+ gchar **argv;
+
+ argv = g_new (gchar*, 6);
+
+ argv[0] = "git";
+ argv[1] = "stash";
+ argv[2] = "show";
+ argv[3] = "--numstat";
+ argv[4] = (gchar*)name;
+ argv[5] = NULL;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, &fd_out, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ g_child_watch_add (*pid, (GChildWatchFunc)tgh_child_exit, parser);
+
+ chan_out = g_io_channel_unix_new (fd_out);
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_out, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, tgh_stash_show_parser_new (GTK_WIDGET (dialog)));
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static gboolean stash_save_spawn (TghStashDialog *dialog, const gchar *name, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_err;
+ GIOChannel *chan_err;
+ TghOutputParser *parser;
+ gchar **argv;
+ struct exit_args *args;
+
+ argv = g_new (gchar*, 6);
+
+ argv[0] = "git";
+ argv[1] = "stash";
+ argv[2] = "save";
+ argv[3] = "-q";
+ argv[4] = (gchar*)name;
+ argv[5] = NULL;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ args = g_new (struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
+
+ g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static gboolean stash_apply_spawn (TghStashDialog *dialog, const gchar *name, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_err;
+ GIOChannel *chan_err;
+ TghOutputParser *parser;
+ gchar **argv;
+ struct exit_args *args;
+
+ argv = g_new (gchar*, 6);
+
+ argv[0] = "git";
+ argv[1] = "stash";
+ argv[2] = "apply";
+ argv[3] = "-q";
+ argv[4] = (gchar*)name;
+ argv[5] = NULL;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ args = g_new (struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
+
+ g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static gboolean stash_pop_spawn (TghStashDialog *dialog, const gchar *name, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_err;
+ GIOChannel *chan_err;
+ TghOutputParser *parser;
+ gchar **argv;
+ struct exit_args *args;
+
+ argv = g_new (gchar*, 6);
+
+ argv[0] = "git";
+ argv[1] = "stash";
+ argv[2] = "pop";
+ argv[3] = "-q";
+ argv[4] = (gchar*)name;
+ argv[5] = NULL;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ args = g_new (struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
+
+ g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static gboolean stash_drop_spawn (TghStashDialog *dialog, const gchar *name, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_err;
+ GIOChannel *chan_err;
+ TghOutputParser *parser;
+ gchar **argv;
+ struct exit_args *args;
+
+ argv = g_new (gchar*, 6);
+
+ argv[0] = "git";
+ argv[1] = "stash";
+ argv[2] = "drop";
+ argv[3] = "-q";
+ argv[4] = (gchar*)name;
+ argv[5] = NULL;
+
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ {
+ g_free (argv);
+ return FALSE;
+ }
+ g_free (argv);
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ args = g_new (struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
+
+ g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static gboolean stash_clear_spawn (TghStashDialog *dialog, GPid *pid)
+{
+ GError *error = NULL;
+ gint fd_err;
+ GIOChannel *chan_err;
+ TghOutputParser *parser;
+ struct exit_args *args;
+
+ if (!g_spawn_async_with_pipes (NULL, argv_clear, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, pid, NULL, NULL, &fd_err, &error))
+ return FALSE;
+
+ parser = tgh_error_parser_new (GTK_WIDGET (dialog));
+
+ args = g_new (struct exit_args, 1);
+ args->parser = parser;
+ args->dialog = dialog;
+
+ g_child_watch_add(*pid, (GChildWatchFunc)child_exit, args);
+
+ chan_err = g_io_channel_unix_new (fd_err);
+ g_io_add_watch (chan_err, G_IO_IN|G_IO_HUP, (GIOFunc)tgh_parse_output_func, parser);
+
+ return TRUE;
+}
+
+static void show_stash (TghStashDialog *dialog, const gchar *name, gpointer user_data)
+{
+ GPid pid;
+ if (stash_show_spawn(dialog, name, &pid))
+ tgh_replace_child(TRUE, pid);
+ else
+ tgh_stash_dialog_done(dialog);
+}
+
+static void save_stash (TghStashDialog *dialog, const gchar *name, gpointer user_data)
+{
+ GPid pid;
+ if (stash_save_spawn(dialog, name, &pid))
+ tgh_replace_child(TRUE, pid);
+ else
+ tgh_stash_dialog_done(dialog);
+}
+
+static void apply_stash (TghStashDialog *dialog, const gchar *name, gpointer user_data)
+{
+ GPid pid;
+ if (stash_apply_spawn(dialog, name, &pid))
+ tgh_replace_child(TRUE, pid);
+ else
+ tgh_stash_dialog_done(dialog);
+}
+
+static void pop_stash (TghStashDialog *dialog, const gchar *name, gpointer user_data)
+{
+ GPid pid;
+ if (stash_pop_spawn(dialog, name, &pid))
+ tgh_replace_child(TRUE, pid);
+ else
+ tgh_stash_dialog_done(dialog);
+}
+
+static void drop_stash (TghStashDialog *dialog, const gchar *name, gpointer user_data)
+{
+ GPid pid;
+ if (stash_drop_spawn(dialog, name, &pid))
+ tgh_replace_child(TRUE, pid);
+ else
+ tgh_stash_dialog_done(dialog);
+}
+
+static void clear_stash (TghStashDialog *dialog, gpointer user_data)
+{
+ GPid pid;
+ if (stash_clear_spawn(dialog, &pid))
+ tgh_replace_child(TRUE, pid);
+ else
+ tgh_stash_dialog_done(dialog);
+}
+
+gboolean tgh_stash (gchar **files, GPid *pid)
+{
+ GtkWidget *dialog;
+
+ dialog = tgh_stash_dialog_new (NULL, NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tgh_cancel, NULL);
+ tgh_dialog_start (GTK_DIALOG (dialog), TRUE);
+
+ if (files)
+ if (chdir(files[0]))
+ return FALSE;
+
+ g_signal_connect(dialog, "selection-changed", G_CALLBACK (show_stash), NULL);
+ g_signal_connect(dialog, "save-clicked", G_CALLBACK (save_stash), NULL);
+ g_signal_connect(dialog, "apply-clicked", G_CALLBACK (apply_stash), NULL);
+ g_signal_connect(dialog, "pop-clicked", G_CALLBACK (pop_stash), NULL);
+ g_signal_connect(dialog, "drop-clicked", G_CALLBACK (drop_stash), NULL);
+ g_signal_connect(dialog, "clear-clicked", G_CALLBACK (clear_stash), NULL);
+
+ return stash_list_spawn(TGH_STASH_DIALOG(dialog), pid);
+}
+
diff --git a/tvp-git-helper/tgh-add.h b/tvp-git-helper/tgh-stash.h
similarity index 87%
copy from tvp-git-helper/tgh-add.h
copy to tvp-git-helper/tgh-stash.h
index 618b78b..7df453c 100644
--- a/tvp-git-helper/tgh-add.h
+++ b/tvp-git-helper/tgh-stash.h
@@ -14,14 +14,14 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef __TGH_ADD_H__
-#define __TGH_ADD_H__
+#ifndef __TGH_STASH_H__
+#define __TGH_STASH_H__
G_BEGIN_DECLS
-gboolean tgh_add (gchar **, GPid *);
+gboolean tgh_stash (gchar**, GPid*);
G_END_DECLS
-#endif /*__TGH_ADD_H__*/
+#endif /*__TGH_STASH_H__*/
diff --git a/tvp-git-helper/tgh-status.c b/tvp-git-helper/tgh-status.c
index 3a353c8..ae37c9d 100644
--- a/tvp-git-helper/tgh-status.c
+++ b/tvp-git-helper/tgh-status.c
@@ -37,14 +37,7 @@
static gchar *argv[] = {"git", "status", NULL};
-struct proc_args
-{
- GtkWidget *dialog;
- gchar *error;
- gchar **files;
-};
-
-gboolean status_spawn (TghStatusDialog *dialog, GPid *pid)
+static gboolean status_spawn (TghStatusDialog *dialog, GPid *pid)
{
GError *error = NULL;
gint fd_out;
@@ -90,7 +83,8 @@ gboolean tgh_status (gchar **files, GPid *pid)
g_signal_connect(dialog, "refresh-clicked", G_CALLBACK(create_status_child), NULL);
if (files)
- chdir(files[0]);
+ if (chdir(files[0]))
+ return FALSE;
return status_spawn(TGH_STATUS_DIALOG(dialog), pid);
}
diff --git a/tvp-git-helper/tgh-transfer-dialog.c b/tvp-git-helper/tgh-transfer-dialog.c
new file mode 100644
index 0000000..c894674
--- /dev/null
+++ b/tvp-git-helper/tgh-transfer-dialog.c
@@ -0,0 +1,228 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs.h>
+#include <gtk/gtk.h>
+#include <dirent.h>
+
+#include "tgh-transfer-dialog.h"
+
+static void browse_callback(GtkButton *, TghTransferDialog *);
+
+struct _TghTransferDialog
+{
+ GtkDialog dialog;
+
+ GtkWidget *repository;
+ GtkWidget *path;
+ GtkWidget *filechooser;
+};
+
+struct _TghTransferDialogClass
+{
+ GtkDialogClass dialog_class;
+};
+
+G_DEFINE_TYPE (TghTransferDialog, tgh_transfer_dialog, GTK_TYPE_DIALOG)
+
+static void
+tgh_transfer_dialog_class_init (TghTransferDialogClass *klass)
+{
+}
+
+static void
+tgh_transfer_dialog_init (TghTransferDialog *dialog)
+{
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *box;
+ GtkWidget *button;
+ GtkWidget *image;
+
+ table = gtk_table_new (2, 2, FALSE);
+
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, FALSE, TRUE, 0);
+ gtk_widget_show (table);
+
+ label = gtk_label_new_with_mnemonic (_("_Repository:"));
+ gtk_table_attach (GTK_TABLE (table), label,
+ 0, 1, 0, 1,
+ GTK_FILL,
+ GTK_FILL,
+ 0, 0);
+
+ box = gtk_hbox_new(FALSE, 0);
+ dialog->repository = gtk_entry_new();
+ dialog->filechooser = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
+
+ image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
+ GTK_ICON_SIZE_MENU);
+ button = gtk_button_new();
+ gtk_button_set_image(GTK_BUTTON(button), image);
+ g_signal_connect(button, "clicked", G_CALLBACK(browse_callback), dialog);
+
+ gtk_box_pack_start(GTK_BOX(box), dialog->repository, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0);
+
+ gtk_widget_show(dialog->repository);
+ gtk_widget_show(button);
+
+ gtk_table_attach (GTK_TABLE (table), box,
+ 1, 2, 0, 1,
+ GTK_EXPAND | GTK_FILL,
+ GTK_FILL,
+ 0, 0);
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->repository);
+ gtk_widget_show(label);
+ gtk_widget_show(box);
+
+ label = gtk_label_new_with_mnemonic (_("_Directory:"));
+ gtk_table_attach (GTK_TABLE (table), label,
+ 0, 1, 1, 2,
+ GTK_FILL,
+ GTK_FILL,
+ 0, 0);
+
+ dialog->path = gtk_file_chooser_button_new (_("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ //dialog->path = gtk_file_chooser_entry_new(_("Select a folder"), GTK_FILE_CHOOSER_ACTION_OPEN);//GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);//tgh_file_chooser_entry_new ();
+ gtk_table_attach (GTK_TABLE (table), dialog->path,
+ 1, 2, 1, 2,
+ GTK_EXPAND | GTK_FILL,
+ GTK_FILL,
+ 0, 0);
+
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->path);
+ gtk_widget_show(label);
+ gtk_widget_show(dialog->path);
+
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Transfer"));
+
+ gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL);
+ gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
+ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+}
+
+GtkWidget*
+tgh_transfer_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags, const gchar *repo_dir, const gchar *local_dir)
+{
+ TghTransferDialog *dialog = g_object_new (TGH_TYPE_TRANSFER_DIALOG, NULL);
+
+ if(title)
+ gtk_window_set_title (GTK_WINDOW(dialog), title);
+
+ if(parent)
+ gtk_window_set_transient_for (GTK_WINDOW(dialog), parent);
+
+ if(flags & GTK_DIALOG_MODAL)
+ gtk_window_set_modal (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_DESTROY_WITH_PARENT)
+ gtk_window_set_destroy_with_parent (GTK_WINDOW(dialog), TRUE);
+
+ if(flags & GTK_DIALOG_NO_SEPARATOR)
+ gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
+
+ if(repo_dir)
+ {
+ gchar *absolute = NULL;
+ if(!g_path_is_absolute (repo_dir))
+ {
+ //TODO: ".."
+ gchar *currdir = g_get_current_dir();
+ absolute = g_build_filename(currdir, (repo_dir[0] == '.' && (!repo_dir[1] || repo_dir[1] == G_DIR_SEPARATOR || repo_dir[1] == '/'))?&repo_dir[1]:repo_dir, NULL);
+ g_free (currdir);
+ }
+ g_free (absolute);
+ }
+
+ if(local_dir)
+ {
+ gboolean isdir = TRUE;
+ gchar *absolute = NULL;
+ DIR *dir;
+ FILE *fp;
+ if(!g_path_is_absolute (local_dir))
+ {
+ //TODO: ".."
+ gchar *currdir = g_get_current_dir();
+ absolute = g_build_filename(currdir, (local_dir[0] == '.' && (!local_dir[1] || local_dir[1] == G_DIR_SEPARATOR || local_dir[1] == '/'))?&local_dir[1]:local_dir, NULL);
+ g_free (currdir);
+ }
+ dir = opendir(absolute?absolute:local_dir);
+ if(dir)
+ closedir(dir);
+ else if((fp = fopen(absolute?absolute:local_dir, "r")))
+ {
+ fclose(fp);
+ isdir = FALSE;
+ }
+ if(isdir)
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dialog->path), absolute?absolute:local_dir);
+ else
+ {
+ gtk_file_chooser_set_action (GTK_FILE_CHOOSER(dialog->path), GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(dialog->path), absolute?absolute:local_dir);
+ }
+ g_free (absolute);
+ }
+
+ return GTK_WIDGET(dialog);
+}
+
+gchar* tgh_transfer_dialog_get_repository (TghTransferDialog *dialog)
+{
+ g_return_val_if_fail (TGH_IS_TRANSFER_DIALOG (dialog), NULL);
+
+ return g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->repository)));
+}
+
+gchar* tgh_transfer_dialog_get_directory (TghTransferDialog *dialog)
+{
+ g_return_val_if_fail (TGH_IS_TRANSFER_DIALOG (dialog), NULL);
+
+ return gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->path));
+}
+
+static void
+browse_callback(GtkButton *button, TghTransferDialog *dialog)
+{
+ gtk_widget_show(dialog->filechooser);
+ if(gtk_dialog_run(GTK_DIALOG(dialog->filechooser)) == GTK_RESPONSE_OK)
+ {
+ gchar *url = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog->filechooser));
+ gtk_entry_set_text(GTK_ENTRY(dialog->repository), url);
+ g_free(url);
+ }
+ gtk_widget_hide(dialog->filechooser);
+}
+
diff --git a/tvp-git-helper/tgh-transfer-dialog.h b/tvp-git-helper/tgh-transfer-dialog.h
new file mode 100644
index 0000000..59d7a14
--- /dev/null
+++ b/tvp-git-helper/tgh-transfer-dialog.h
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2006 Peter de Ridder <peter at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __TGH_TRANSFER_DIALOG_H__
+#define __TGH_TRANSFER_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _TghTransferDialogClass TghTransferDialogClass;
+typedef struct _TghTransferDialog TghTransferDialog;
+
+#define TGH_TYPE_TRANSFER_DIALOG (tgh_transfer_dialog_get_type ())
+#define TGH_TRANSFER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TGH_TYPE_TRANSFER_DIALOG, TghTransferDialog))
+#define TGH_TRANSFER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TGH_TYPE_TRANSFER_DIALOG, TghTransferDialogClass))
+#define TGH_IS_TRANSFER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TGH_TYPE_TRANSFER_DIALOG))
+#define TGH_IS_TRANSFER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TGH_TYPE_TRANSFER_DIALOG))
+#define TGH_TRANSFER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TGH_TYPE_TRANSFER_DIALOG, TghTransferDialogClass))
+
+GType tgh_transfer_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tgh_transfer_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags,
+ const gchar *repo_dir,
+ const gchar *local_dir) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+gchar* tgh_transfer_dialog_get_repository (TghTransferDialog*);
+gchar* tgh_transfer_dialog_get_directory (TghTransferDialog*);
+
+G_END_DECLS;
+
+#endif /* !__TGH_TRANSFER_DIALOG_H__ */
diff --git a/tvp-svn-helper/Makefile.am b/tvp-svn-helper/Makefile.am
index 12aa9af..5496ef7 100644
--- a/tvp-svn-helper/Makefile.am
+++ b/tvp-svn-helper/Makefile.am
@@ -88,7 +88,8 @@ tvp_svn_helper_SOURCES = \
tsh-trust-dialog.c
tvp_svn_helper_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"tvp-svn-helper\"
+ -DG_LOG_DOMAIN=\"tvp-svn-helper\" \
+ $(AM_CPPFLAGS)
tvp_svn_helper_CFLAGS = \
$(PLATFORM_CFLAGS) \
diff --git a/tvp-svn-helper/main.c b/tvp-svn-helper/main.c
index 4a1dab6..75e03c0 100644
--- a/tvp-svn-helper/main.c
+++ b/tvp-svn-helper/main.c
@@ -233,6 +233,9 @@ int main (int argc, char *argv[])
{ NULL, '\0', 0, 0, NULL, NULL, NULL }
};
+ /* setup translation domain */
+ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+
if (!g_thread_supported ())
g_thread_init (NULL);
gdk_threads_init ();
diff --git a/tvp-svn-helper/tsh-blame.c b/tvp-svn-helper/tsh-blame.c
index 9ba8499..67c5787 100644
--- a/tvp-svn-helper/tsh-blame.c
+++ b/tvp-svn-helper/tsh-blame.c
@@ -73,7 +73,7 @@ static gpointer blame_thread (gpointer user_data)
tsh_blame_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Blame failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
gdk_threads_leave();
g_free(error_str);
diff --git a/tvp-svn-helper/tsh-cleanup.c b/tvp-svn-helper/tsh-cleanup.c
index 436b974..7f310a2 100644
--- a/tvp-svn-helper/tsh-cleanup.c
+++ b/tvp-svn-helper/tsh-cleanup.c
@@ -64,7 +64,7 @@ static gpointer cleanup_thread (gpointer user_data)
gdk_threads_enter();
gtk_widget_destroy(dialog);
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Cleanup failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(dialog), TRUE);
gdk_threads_leave();
g_free(error_str);
diff --git a/tvp-svn-helper/tsh-commit.c b/tvp-svn-helper/tsh-commit.c
index 1cc885b..f512c23 100644
--- a/tvp-svn-helper/tsh-commit.c
+++ b/tvp-svn-helper/tsh-commit.c
@@ -57,40 +57,84 @@ static gpointer commit_thread (gpointer user_data)
TshNotifyDialog *dialog = args->dialog;
GSList *files = args->files;
GSList *iter;
- gint size;
+ GSList *delete = NULL;
+ //GSList *reverse_start = NULL, *reverse_end = NULL;
+ gint delete_size = 0;
+ gint size = 0;
+ gint size_indirect = 0;
+ gboolean recursive = TRUE;
gchar *error_str;
gchar *message;
gchar buffer[256];
g_free (args);
- size = 0;
-
subpool = svn_pool_create (pool);
- for (iter = files; iter; iter = g_slist_next (iter))
+ for (iter = files; result && iter; iter = g_slist_next (iter))
{
TshFileInfo *info;
- size++;
+ size_indirect++;
info = iter->data;
- if (info->status == TSH_FILE_STATUS_UNVERSIONED && !(info->flags&TSH_FILE_INFO_INDIRECT))
+
+ if (!(info->flags & TSH_FILE_INFO_INDIRECT))
{
- if ((err = svn_client_add4(info->path, (info->flags&TSH_FILE_INFO_RECURSIVE)?svn_depth_infinity:svn_depth_empty, FALSE, FALSE, FALSE, ctx, subpool)))
+ if (!(info->flags & TSH_FILE_INFO_RECURSIVE))
+ recursive = FALSE;
+ size++;
+ switch (info->status)
{
- error_str = tsh_strerror(err);
- gdk_threads_enter();
- tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
- gdk_threads_leave();
- g_free(error_str);
-
- svn_error_clear(err);
- result = FALSE;
- break;//FIXME: needed ??
+ case TSH_FILE_STATUS_MISSING:
+ delete_size++;
+ delete = g_slist_prepend (delete, info);
+ break;
+ case TSH_FILE_STATUS_UNVERSIONED:
+ if ((err = svn_client_add4(info->path, (info->flags&TSH_FILE_INFO_RECURSIVE)?svn_depth_infinity:svn_depth_empty, FALSE, FALSE, FALSE, ctx, subpool)))
+ {
+ error_str = tsh_strerror(err);
+ gdk_threads_enter();
+ tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
+ gdk_threads_leave();
+ g_free(error_str);
+
+ svn_error_clear(err);
+ result = FALSE;//FIXME: needed ??
+ }
+ break;
+ default:
+ break;
}
}
}
+ if (result && delete_size)
+ {
+ paths = apr_array_make (subpool, delete_size, sizeof (const char *));
+
+ for (iter = delete; iter; iter = g_slist_next (iter))
+ {
+ TshFileInfo *info = iter->data;
+ APR_ARRAY_PUSH (paths, const char *) = info->path;
+ }
+
+ if ((err = svn_client_delete3(NULL, paths, FALSE, FALSE, NULL, ctx, subpool)))
+ {
+ svn_pool_destroy (subpool);
+
+ error_str = tsh_strerror(err);
+ gdk_threads_enter();
+ tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
+ gdk_threads_leave();
+ g_free(error_str);
+
+ svn_error_clear(err);
+ result = FALSE;//FIXME: needed ??
+ }
+ }
+
+ g_slist_free (delete);
+
svn_pool_destroy (subpool);
/* check if an error occurred in add commands */
@@ -98,13 +142,29 @@ static gpointer commit_thread (gpointer user_data)
{
subpool = svn_pool_create (pool);
- if(size)
+ if(recursive && size)
{
paths = apr_array_make (subpool, size, sizeof (const char *));
for (iter = files; iter; iter = g_slist_next (iter))
{
TshFileInfo *info = iter->data;
+ if (!(info->flags & TSH_FILE_INFO_INDIRECT))
+ {
+ APR_ARRAY_PUSH (paths, const char *) = info->path;
+ }
+ }
+ }
+ else if(size_indirect)
+ {
+ /* Set recursive to false if it wasn't already, FIXME: needed?? */
+ recursive = FALSE;
+
+ paths = apr_array_make (subpool, size_indirect, sizeof (const char *));
+
+ for (iter = files; iter; iter = g_slist_next (iter))
+ {
+ TshFileInfo *info = iter->data;
APR_ARRAY_PUSH (paths, const char *) = info->path;
}
}
@@ -115,7 +175,7 @@ static gpointer commit_thread (gpointer user_data)
APR_ARRAY_PUSH (paths, const char *) = ""; // current directory
}
- if ((err = svn_client_commit4(&commit_info, paths, svn_depth_empty, FALSE, FALSE, NULL, NULL, ctx, subpool)))
+ if ((err = svn_client_commit4(&commit_info, paths, recursive?svn_depth_infinity:svn_depth_empty, FALSE, FALSE, NULL, NULL, ctx, subpool)))
{
svn_pool_destroy (subpool);
@@ -167,7 +227,7 @@ GThread *tsh_commit (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
return NULL;
}
g_strfreev (files);
- file_list = tsh_file_selection_dialog_get_file_info (TSH_FILE_SELECTION_DIALOG (dialog));
+ file_list = tsh_file_selection_dialog_get_file_info_by_status (TSH_FILE_SELECTION_DIALOG (dialog), TSH_FILE_STATUS_INVALID, TRUE);
gtk_widget_destroy (dialog);
if(!file_list)
diff --git a/tvp-svn-helper/tsh-common.c b/tvp-svn-helper/tsh-common.c
index fe6c174..60a9275 100644
--- a/tvp-svn-helper/tsh-common.c
+++ b/tvp-svn-helper/tsh-common.c
@@ -263,11 +263,12 @@ tsh_auth_simple_plaintext_prompt(svn_boolean_t *may_save_plaintext,
void *baton,
apr_pool_t *pool)
{
+ GtkWidget *dialog;
gint result;
gdk_threads_enter();
- GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Store password a plaintext?"));
+ dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Store password a plaintext?"));
result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -288,12 +289,16 @@ tsh_auth_simple_prompt(svn_auth_cred_simple_t **cred,
svn_boolean_t may_save,
apr_pool_t *pool)
{
+ GtkWidget *dialog;
+ svn_auth_cred_simple_t *ret;
+ TshLoginDialog *login_dialog;
+
if(!username)
username = "";
gdk_threads_enter();
- GtkWidget *dialog = tsh_login_dialog_new(NULL, NULL, 0, username, TRUE, may_save);
+ dialog = tsh_login_dialog_new(NULL, NULL, 0, username, TRUE, may_save);
if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
{
@@ -309,8 +314,8 @@ tsh_auth_simple_prompt(svn_auth_cred_simple_t **cred,
gdk_threads_leave();
- svn_auth_cred_simple_t *ret = apr_pcalloc(pool, sizeof(svn_auth_cred_simple_t));
- TshLoginDialog *login_dialog = TSH_LOGIN_DIALOG(dialog);
+ ret = apr_pcalloc(pool, sizeof(svn_auth_cred_simple_t));
+ login_dialog = TSH_LOGIN_DIALOG(dialog);
ret->username = apr_pstrdup(pool, tsh_login_dialog_get_username(login_dialog));
ret->password = apr_pstrdup(pool, tsh_login_dialog_get_password(login_dialog));
ret->may_save = tsh_login_dialog_get_may_save(login_dialog);
@@ -328,9 +333,13 @@ tsh_auth_username_prompt(svn_auth_cred_username_t **cred,
svn_boolean_t may_save,
apr_pool_t *pool)
{
+ GtkWidget *dialog;
+ svn_auth_cred_username_t *ret;
+ TshLoginDialog *login_dialog;
+
gdk_threads_enter();
- GtkWidget *dialog = tsh_login_dialog_new(NULL, NULL, 0, "", FALSE, may_save);
+ dialog = tsh_login_dialog_new(NULL, NULL, 0, "", FALSE, may_save);
if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
{
@@ -346,8 +355,8 @@ tsh_auth_username_prompt(svn_auth_cred_username_t **cred,
gdk_threads_leave();
- svn_auth_cred_username_t *ret = apr_pcalloc(pool, sizeof(svn_auth_cred_username_t));
- TshLoginDialog *login_dialog = TSH_LOGIN_DIALOG(dialog);
+ ret = apr_pcalloc(pool, sizeof(svn_auth_cred_username_t));
+ login_dialog = TSH_LOGIN_DIALOG(dialog);
ret->username = apr_pstrdup(pool, tsh_login_dialog_get_username(login_dialog));
ret->may_save = tsh_login_dialog_get_may_save(login_dialog);
*cred = ret;
@@ -366,9 +375,13 @@ tsh_auth_ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred,
svn_boolean_t may_save,
apr_pool_t *pool)
{
+ GtkWidget *dialog;
+ svn_auth_cred_ssl_server_trust_t *ret;
+ TshTrustDialog *trust_dialog;
+
gdk_threads_enter();
- GtkWidget *dialog = tsh_trust_dialog_new(NULL, NULL, 0, failures, may_save);
+ dialog = tsh_trust_dialog_new(NULL, NULL, 0, failures, may_save);
if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
{
@@ -384,8 +397,8 @@ tsh_auth_ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred,
gdk_threads_leave();
- svn_auth_cred_ssl_server_trust_t *ret = apr_pcalloc(pool, sizeof(svn_auth_cred_ssl_server_trust_t));
- TshTrustDialog *trust_dialog = TSH_TRUST_DIALOG(dialog);
+ ret = apr_pcalloc(pool, sizeof(svn_auth_cred_ssl_server_trust_t));
+ trust_dialog = TSH_TRUST_DIALOG(dialog);
ret->may_save = tsh_trust_dialog_get_may_save(trust_dialog);
ret->accepted_failures = tsh_trust_dialog_get_accepted(trust_dialog);
*cred = ret;
@@ -402,9 +415,13 @@ tsh_auth_ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t **cred,
svn_boolean_t may_save,
apr_pool_t *pool)
{
+ GtkWidget *dialog;
+ svn_auth_cred_ssl_client_cert_t *ret;
+ TshFileDialog *file_dialog;
+
gdk_threads_enter();
- GtkWidget *dialog = tsh_file_dialog_new(NULL, NULL, 0, may_save);
+ dialog = tsh_file_dialog_new(NULL, NULL, 0, may_save);
if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
{
@@ -420,8 +437,8 @@ tsh_auth_ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t **cred,
gdk_threads_leave();
- svn_auth_cred_ssl_client_cert_t *ret = apr_pcalloc(pool, sizeof(svn_auth_cred_ssl_client_cert_t));
- TshFileDialog *file_dialog = TSH_FILE_DIALOG(dialog);
+ ret = apr_pcalloc(pool, sizeof(svn_auth_cred_ssl_client_cert_t));
+ file_dialog = TSH_FILE_DIALOG(dialog);
ret->cert_file = apr_pstrdup(pool, tsh_file_dialog_get_filename(file_dialog));
ret->may_save = tsh_file_dialog_get_may_save(file_dialog);
*cred = ret;
@@ -438,9 +455,13 @@ tsh_auth_ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred,
svn_boolean_t may_save,
apr_pool_t *pool)
{
+ GtkWidget *dialog;
+ svn_auth_cred_ssl_client_cert_pw_t *ret;
+ TshLoginDialog *login_dialog;
+
gdk_threads_enter();
- GtkWidget *dialog = tsh_login_dialog_new(NULL, NULL, 0, NULL, TRUE, may_save);
+ dialog = tsh_login_dialog_new(NULL, NULL, 0, NULL, TRUE, may_save);
if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
{
@@ -456,8 +477,8 @@ tsh_auth_ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred,
gdk_threads_leave();
- svn_auth_cred_ssl_client_cert_pw_t *ret = apr_pcalloc(pool, sizeof(svn_auth_cred_ssl_client_cert_pw_t));
- TshLoginDialog *login_dialog = TSH_LOGIN_DIALOG(dialog);
+ ret = apr_pcalloc(pool, sizeof(svn_auth_cred_ssl_client_cert_pw_t));
+ login_dialog = TSH_LOGIN_DIALOG(dialog);
ret->password = apr_pstrdup(pool, tsh_login_dialog_get_password(login_dialog));
ret->may_save = tsh_login_dialog_get_may_save(login_dialog);
*cred = ret;
@@ -468,7 +489,7 @@ tsh_auth_ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred,
}
void
-tsh_cancel()
+tsh_cancel(void)
{
cancelled = TRUE;
}
@@ -482,7 +503,7 @@ tsh_check_cancel(void *baton)
}
void
-tsh_reset_cancel()
+tsh_reset_cancel(void)
{
cancelled = FALSE;
}
@@ -663,7 +684,9 @@ tsh_status_to_string(enum svn_wc_status_kind status)
status_string = status_table[status];
break;
}
- return _(status_string);
+
+ /* Check for None and Unversioned empty strings */
+ return status_string[0]?_(status_string):"";
}
static const gchar *
@@ -849,12 +872,12 @@ tsh_log_func (void *baton, svn_log_entry_t *log_entry, apr_pool_t *pool)
apr_hash_index_t *hi;
for (hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) {
const svn_log_changed_path_t *changed;
- const char *path;
+ const char *path_;
TshLogFile *file;
- apr_hash_this(hi, (const void**)&path, NULL, (void**)&changed);
+ apr_hash_this(hi, (const void**)&path_, NULL, (void**)&changed);
file = g_new(TshLogFile, 1);
file->action = tsh_char_to_string (changed->action);
- file->file = g_strdup (path);
+ file->file = g_strdup (path_);
files = g_slist_prepend (files, file);
}
}
@@ -975,6 +998,7 @@ tsh_strerror(svn_error_t *err)
gchar *
tsh_is_working_copy (const gchar *uri, apr_pool_t *pool)
{
+ gchar *path;
svn_error_t *err;
int wc_format;
@@ -984,7 +1008,7 @@ tsh_is_working_copy (const gchar *uri, apr_pool_t *pool)
uri += 7;
}
- gchar *path = g_strdup (uri);
+ path = g_strdup (uri);
/* remove trailing '/' cause svn_wc_check_wc can't handle that */
if (path[strlen (path) - 1] == '/')
diff --git a/tvp-svn-helper/tsh-common.h b/tvp-svn-helper/tsh-common.h
index 5750c16..102ff6f 100644
--- a/tvp-svn-helper/tsh-common.h
+++ b/tvp-svn-helper/tsh-common.h
@@ -22,8 +22,8 @@ G_BEGIN_DECLS
gboolean tsh_init (apr_pool_t**, svn_error_t**);
void tsh_replace_thread (GThread *);
-void tsh_cancel ();
-void tsh_reset_cancel();
+void tsh_cancel (void);
+void tsh_reset_cancel(void);
gboolean tsh_create_context (svn_client_ctx_t**, apr_pool_t*, svn_error_t**);
diff --git a/tvp-svn-helper/tsh-copy.c b/tvp-svn-helper/tsh-copy.c
index 7f13d75..74c3d9d 100644
--- a/tvp-svn-helper/tsh-copy.c
+++ b/tvp-svn-helper/tsh-copy.c
@@ -121,11 +121,13 @@ GThread *tsh_copy (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
GtkWidget *dialog;
gchar *from;
gchar *to;
+ gboolean isdir = TRUE;
+ gchar *absolute = NULL;
+ DIR *dir;
+ FILE *fp;
from = files?files[0]:"";
- gboolean isdir = TRUE;
- gchar *absolute = NULL;
if(!g_path_is_absolute (from))
{
//TODO: ".."
@@ -133,8 +135,7 @@ GThread *tsh_copy (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
absolute = g_build_filename(currdir, (from[0] == '.' && (!from[1] || from[1] == G_DIR_SEPARATOR || from[1] == '/'))?&from[1]:from, NULL);
g_free (currdir);
}
- DIR *dir = opendir(absolute?absolute:from);
- FILE *fp;
+ dir = opendir(absolute?absolute:from);
if(dir)
closedir(dir);
else if((fp = fopen(absolute?absolute:from, "r")))
diff --git a/tvp-svn-helper/tsh-delete.c b/tvp-svn-helper/tsh-delete.c
index b023768..270fb62 100644
--- a/tvp-svn-helper/tsh-delete.c
+++ b/tvp-svn-helper/tsh-delete.c
@@ -124,7 +124,7 @@ GThread *tsh_delete (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
GtkWidget *dialog;
struct thread_args *args;
- dialog = tsh_file_selection_dialog_new (_("Delete"), NULL, 0, files, TSH_FILE_SELECTION_FLAG_RECURSIVE|TSH_FILE_SELECTION_FLAG_MODIFIED|TSH_FILE_SELECTION_FLAG_UNCHANGED, ctx, pool);
+ dialog = tsh_file_selection_dialog_new (_("Delete"), NULL, 0, files, TSH_FILE_SELECTION_FLAG_RECURSIVE|TSH_FILE_SELECTION_FLAG_UNCHANGED, ctx, pool);
if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
{
gtk_widget_destroy (dialog);
diff --git a/tvp-svn-helper/tsh-file-selection-dialog.c b/tvp-svn-helper/tsh-file-selection-dialog.c
index 89e441e..c283421 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.c
+++ b/tvp-svn-helper/tsh-file-selection-dialog.c
@@ -36,7 +36,8 @@ static svn_error_t *tsh_file_selection_status_func3 (void *, const char *, svn_w
static void selection_cell_toggled (GtkCellRendererToggle *, gchar *, gpointer);
static void selection_all_toggled (GtkToggleButton *, gpointer);
-struct copy_context { union { gchar **string; GSList *linked; guint count; } list; TshFileStatus status; };
+struct select_context { TshFileSelectionDialog *dialog; gboolean select; };
+struct copy_context { union { gchar **string; GSList *linked; guint count; } list; TshFileStatus status; gboolean indirect; };
static gboolean count_selected (GtkTreeModel*, GtkTreePath*, GtkTreeIter*, gpointer);
static gboolean copy_selected_string (GtkTreeModel*, GtkTreePath*, GtkTreeIter*, gpointer);
static gboolean copy_selected_linked (GtkTreeModel*, GtkTreePath*, GtkTreeIter*, gpointer);
@@ -44,7 +45,8 @@ static gboolean set_selected (GtkTreeModel*, GtkTreePath*, GtkTreeIter*, gpointe
static void move_info (GtkTreeStore*, GtkTreeIter*, GtkTreeIter*);
static void add_unversioned (GtkTreeStore*, const gchar*, gboolean, gboolean);
-static void set_children_status (GtkTreeStore*, GtkTreeIter*, gboolean, gboolean);
+static void set_children_status_unversioned (GtkTreeStore*, GtkTreeIter*, gboolean, gboolean);
+static void set_children_status (TshFileSelectionDialog *, GtkTreeStore*, GtkTreeIter*, gboolean, gboolean);
struct _TshFileSelectionDialog
{
@@ -229,11 +231,11 @@ tsh_file_selection_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogF
gchar**
tsh_file_selection_dialog_get_files (TshFileSelectionDialog *dialog)
{
- return tsh_file_selection_dialog_get_files_by_status (dialog, TSH_FILE_STATUS_OTHER);
+ return tsh_file_selection_dialog_get_files_by_status (dialog, TSH_FILE_STATUS_INVALID, FALSE);
}
gchar**
-tsh_file_selection_dialog_get_files_by_status (TshFileSelectionDialog *dialog, TshFileStatus status)
+tsh_file_selection_dialog_get_files_by_status (TshFileSelectionDialog *dialog, TshFileStatus status, gboolean indirect)
{
GtkTreeModel *model;
gchar **files;
@@ -242,6 +244,7 @@ tsh_file_selection_dialog_get_files_by_status (TshFileSelectionDialog *dialog, T
g_return_val_if_fail (TSH_IS_FILE_SELECTION_DIALOG (dialog), NULL);
ctx.status = status;
+ ctx.indirect = indirect;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
@@ -263,11 +266,11 @@ tsh_file_selection_dialog_get_files_by_status (TshFileSelectionDialog *dialog, T
GSList*
tsh_file_selection_dialog_get_file_info (TshFileSelectionDialog *dialog)
{
- return tsh_file_selection_dialog_get_file_info_by_status (dialog, TSH_FILE_STATUS_OTHER);
+ return tsh_file_selection_dialog_get_file_info_by_status (dialog, TSH_FILE_STATUS_INVALID, FALSE);
}
GSList*
-tsh_file_selection_dialog_get_file_info_by_status (TshFileSelectionDialog *dialog, TshFileStatus status)
+tsh_file_selection_dialog_get_file_info_by_status (TshFileSelectionDialog *dialog, TshFileStatus status, gboolean indirect)
{
GtkTreeModel *model;
struct copy_context ctx;
@@ -275,6 +278,7 @@ tsh_file_selection_dialog_get_file_info_by_status (TshFileSelectionDialog *dialo
g_return_val_if_fail (TSH_IS_FILE_SELECTION_DIALOG (dialog), NULL);
ctx.status = status;
+ ctx.indirect = indirect;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
@@ -285,41 +289,141 @@ tsh_file_selection_dialog_get_file_info_by_status (TshFileSelectionDialog *dialo
return g_slist_reverse (ctx.list.linked);
}
+static TshFileStatus
+get_parent_status(GtkTreeModel *model, GtkTreeIter *iter)
+{
+ GtkTreeIter parent, child;
+ TshFileStatus status = TSH_FILE_STATUS_INVALID;
+
+ child = *iter;
+
+ while (gtk_tree_model_iter_parent (model, &parent, &child))
+ {
+ gint parent_status;
+ gtk_tree_model_get (model, &parent, COLUMN_STATUS, &parent_status, -1);
+
+ if (parent_status != TSH_FILE_STATUS_INVALID)
+ {
+ status = parent_status;
+ break;
+ }
+
+ child = parent;
+ }
+
+ return status;
+}
+
static void
tsh_file_selection_status_func2(void *baton, const char *path, svn_wc_status2_t *status)
{
- TshFileSelectionDialog *dialog = TSH_FILE_SELECTION_DIALOG (baton);
+ TshFileSelectionDialog *dialog = TSH_FILE_SELECTION_DIALOG (baton);
gboolean add = FALSE;
- if (dialog->flags & (status->entry?(TSH_FILE_SELECTION_FLAG_MODIFIED|TSH_FILE_SELECTION_FLAG_UNCHANGED|TSH_FILE_SELECTION_FLAG_IGNORED):TSH_FILE_SELECTION_FLAG_UNVERSIONED))
- add = TRUE;
+ if (status->entry)
+ {
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_CONFLICTED)
+ if (status->text_status == svn_wc_status_conflicted || status->prop_status == svn_wc_status_conflicted)
+ add = TRUE;
- if (dialog->flags & TSH_FILE_SELECTION_FLAG_CONFLICTED)
- if(status->text_status == svn_wc_status_conflicted || status->prop_status == svn_wc_status_conflicted)
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_UNCHANGED)
+ if (status->text_status == svn_wc_status_normal && (status->prop_status == svn_wc_status_normal || status->prop_status == svn_wc_status_none))
+ add = TRUE;
+
+ if (dialog->flags & (TSH_FILE_SELECTION_FLAG_MODIFIED|TSH_FILE_SELECTION_FLAG_IGNORED))
add = TRUE;
+ }
+ else if (dialog->flags & TSH_FILE_SELECTION_FLAG_UNVERSIONED)
+ add = TRUE;
+
if (add)
{
GtkTreeModel *model;
GtkTreeIter iter;
+ gboolean select_ = TRUE;
+ gboolean enable = TRUE;
+ gint file_status = TSH_FILE_STATUS_OTHER;
+ TshFileStatus parent_status;
+
+ if (G_LIKELY (status->entry))
+ {
+ if (status->text_status == svn_wc_status_added)
+ {
+ file_status = TSH_FILE_STATUS_ADDED;
+ }
+ else if (status->text_status == svn_wc_status_deleted)
+ {
+ file_status = TSH_FILE_STATUS_DELETED;
+ }
+ else if (status->text_status == svn_wc_status_missing)
+ {
+ file_status = TSH_FILE_STATUS_MISSING;
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ enable = FALSE;
+ else if (!(dialog->flags & TSH_FILE_SELECTION_FLAG_AUTO_SELECT_MISSING))
+ select_ = FALSE;
+ }
+ }
+ else
+ {
+ file_status = TSH_FILE_STATUS_UNVERSIONED;
+ if (!(dialog->flags & TSH_FILE_SELECTION_FLAG_AUTO_SELECT_UNVERSIONED))
+ select_ = FALSE;
+ }
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
tsh_tree_get_iter_for_path (GTK_TREE_STORE (model), path, &iter, COLUMN_NAME, move_info);
+
+ parent_status = get_parent_status (model, &iter);
+
+ if (status->text_status == svn_wc_status_normal && (status->prop_status == svn_wc_status_normal || status->prop_status == svn_wc_status_none))
+ {
+ file_status = TSH_FILE_STATUS_UNCHANGED;
+ if (parent_status == TSH_FILE_STATUS_UNCHANGED)
+ enable = FALSE;
+ }
+ else if (status->entry && status->text_status != svn_wc_status_missing)
+ {
+ if (parent_status != TSH_FILE_STATUS_INVALID)
+ enable = FALSE;
+ }
+
gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
COLUMN_PATH, path,
COLUMN_TEXT_STAT, tsh_status_to_string(status->text_status),
COLUMN_PROP_STAT, tsh_status_to_string(status->prop_status),
- COLUMN_SELECTION, (status->entry || dialog->flags & TSH_FILE_SELECTION_FLAG_AUTO_SELECT_UNVERSIONED),
+ COLUMN_SELECTION, select_,
COLUMN_NON_RECURSIVE, FALSE,
- COLUMN_ENABLED, TRUE,
- COLUMN_STATUS, status->entry?TSH_FILE_STATUS_OTHER:TSH_FILE_STATUS_UNVERSIONED,
+ COLUMN_ENABLED, enable,
+ COLUMN_STATUS, file_status,
-1);
- if (!status->entry)
+ switch (file_status)
{
- /* Unversioned: get all children */
- add_unversioned (GTK_TREE_STORE (model), path, dialog->flags & TSH_FILE_SELECTION_FLAG_AUTO_SELECT_UNVERSIONED, FALSE);
+ case TSH_FILE_STATUS_UNCHANGED:
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, select_, !select_);
+ break;
+ case TSH_FILE_STATUS_ADDED:
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, select_, !select_);
+ else
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, select_, FALSE);
+ break;
+ case TSH_FILE_STATUS_DELETED:
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, select_, FALSE);
+ else
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, select_, !select_);
+ break;
+ case TSH_FILE_STATUS_UNVERSIONED:
+ /* Unversioned: get all children */
+ add_unversioned (GTK_TREE_STORE (model), path, select_, FALSE);
+ break;
+ default:
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, select_, !select_);
+ break;
}
}
}
@@ -334,7 +438,7 @@ tsh_file_selection_status_func3(void *baton, const char *path, svn_wc_status2_t
static void
selection_cell_toggled (GtkCellRendererToggle *renderer, gchar *path, gpointer user_data)
{
- TshFileSelectionDialog *dialog = TSH_FILE_SELECTION_DIALOG (user_data);
+ TshFileSelectionDialog *dialog = TSH_FILE_SELECTION_DIALOG (user_data);
GtkTreeModel *model;
GtkTreeIter iter;
gboolean selection, non_recursive;
@@ -351,7 +455,13 @@ selection_cell_toggled (GtkCellRendererToggle *renderer, gchar *path, gpointer u
-1);
switch (status)
{
- case TSH_FILE_STATUS_UNVERSIONED:
+ case TSH_FILE_STATUS_DELETED:
+ if (!(dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN))
+ {
+ selection = !selection;
+ break;
+ }
+ default:
if (gtk_tree_model_iter_has_child (model, &iter))
{
#if 0 /* 4 states, not selected -> non recursive (no children selected) -> selected -> non recursive (children selected) */
@@ -375,17 +485,39 @@ selection_cell_toggled (GtkCellRendererToggle *renderer, gchar *path, gpointer u
#endif
break;
}
- default:
+ case TSH_FILE_STATUS_UNCHANGED:
selection = !selection;
break;
}
+
gtk_tree_store_set (GTK_TREE_STORE (model), &iter,
COLUMN_SELECTION, selection,
COLUMN_NON_RECURSIVE, non_recursive,
-1);
- if (status == TSH_FILE_STATUS_UNVERSIONED)
+ switch (status)
{
- set_children_status (GTK_TREE_STORE (model), &iter, selection, non_recursive);
+ case TSH_FILE_STATUS_UNCHANGED:
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, !selection);
+ break;
+ case TSH_FILE_STATUS_ADDED:
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, !selection);
+ else
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, non_recursive);
+ break;
+ case TSH_FILE_STATUS_DELETED:
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, non_recursive);
+ else
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, !selection);
+ break;
+ case TSH_FILE_STATUS_UNVERSIONED:
+ set_children_status_unversioned (GTK_TREE_STORE (model), &iter, selection, non_recursive);
+ break;
+ default:
+ if(selection)
+ set_children_status (dialog, GTK_TREE_STORE (model), &iter, selection, non_recursive);
+ break;
}
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (dialog->all), TRUE);
@@ -394,29 +526,32 @@ selection_cell_toggled (GtkCellRendererToggle *renderer, gchar *path, gpointer u
static void
selection_all_toggled (GtkToggleButton *button, gpointer user_data)
{
- TshFileSelectionDialog *dialog = TSH_FILE_SELECTION_DIALOG (user_data);
+ TshFileSelectionDialog *dialog = TSH_FILE_SELECTION_DIALOG (user_data);
GtkTreeModel *model;
- gboolean selection;
+ struct select_context ctx;
+
+ ctx.dialog = dialog;
gtk_toggle_button_set_inconsistent (button, FALSE);
-
- selection = gtk_toggle_button_get_active (button);
+
+ ctx.select = gtk_toggle_button_get_active (button);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
- gtk_tree_model_foreach (model, set_selected, GINT_TO_POINTER (selection));
+ gtk_tree_model_foreach (model, set_selected, &ctx);
}
static gboolean
count_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer ctx)
{
- gboolean selection;
- gint status;
+ gboolean selection, enabled;
+ TshFileStatus status;
gtk_tree_model_get (model, iter,
COLUMN_SELECTION, &selection,
COLUMN_STATUS, &status,
+ COLUMN_ENABLED, &enabled,
-1);
- if (selection && (((struct copy_context*)ctx)->status == TSH_FILE_STATUS_OTHER || ((struct copy_context*)ctx)->status == status))
+ if (selection && (((struct copy_context*)ctx)->status == TSH_FILE_STATUS_INVALID || ((struct copy_context*)ctx)->status == status) && (enabled || ((struct copy_context*)ctx)->indirect))
((struct copy_context*)ctx)->list.count++;
return FALSE;
}
@@ -424,13 +559,14 @@ count_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpoin
static gboolean
copy_selected_string (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer ctx)
{
- gboolean selection;
- gint status;
+ gboolean selection, enabled;
+ TshFileStatus status;
gtk_tree_model_get (model, iter,
COLUMN_SELECTION, &selection,
COLUMN_STATUS, &status,
+ COLUMN_ENABLED, &enabled,
-1);
- if (selection && (((struct copy_context*)ctx)->status == TSH_FILE_STATUS_OTHER || ((struct copy_context*)ctx)->status == status))
+ if (selection && (((struct copy_context*)ctx)->status == TSH_FILE_STATUS_INVALID || ((struct copy_context*)ctx)->status == status) && (enabled || ((struct copy_context*)ctx)->indirect))
{
gtk_tree_model_get (model, iter,
COLUMN_PATH, ((struct copy_context*)ctx)->list.string,
@@ -443,23 +579,21 @@ copy_selected_string (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
static gboolean
copy_selected_linked (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer ctx)
{
- gboolean selection;
- gint status;
+ gboolean selection, enabled;
+ TshFileStatus status;
gtk_tree_model_get (model, iter,
COLUMN_SELECTION, &selection,
COLUMN_STATUS, &status,
+ COLUMN_ENABLED, &enabled,
-1);
- if (selection && (((struct copy_context*)ctx)->status == TSH_FILE_STATUS_OTHER || ((struct copy_context*)ctx)->status == status))
+ if (selection && (((struct copy_context*)ctx)->status == TSH_FILE_STATUS_INVALID || ((struct copy_context*)ctx)->status == status) && (enabled || ((struct copy_context*)ctx)->indirect))
{
- gboolean non_recursive, enabled;
+ gboolean non_recursive;
TshFileInfo *info = g_new (TshFileInfo, 1);
gtk_tree_model_get (model, iter,
COLUMN_PATH, &info->path,
COLUMN_NON_RECURSIVE, &non_recursive,
- COLUMN_ENABLED, &enabled,
-1);
- if (status != TSH_FILE_STATUS_UNVERSIONED)
- non_recursive = !non_recursive;
info->flags = (non_recursive?0:TSH_FILE_INFO_RECURSIVE) | (enabled?0:TSH_FILE_INFO_INDIRECT);
info->status = status;
((struct copy_context*)ctx)->list.linked = g_slist_prepend (((struct copy_context*)ctx)->list.linked, info);
@@ -468,33 +602,51 @@ copy_selected_linked (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
}
static gboolean
-set_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer selection)
+set_selected (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer ctx)
{
- GtkTreeIter parent;
- gboolean enabled, unversioned_enabled = TRUE;
+ TshFileStatus parent_status;
+ gint status;
+ gboolean enabled = TRUE;
gtk_tree_model_get (model, iter,
- COLUMN_ENABLED, &enabled,
+ COLUMN_STATUS, &status,
-1);
- if (gtk_tree_model_iter_parent (model, &parent, iter))
+ if (status != TSH_FILE_STATUS_INVALID)
{
- gint status;
- gtk_tree_model_get (model, &parent,
- COLUMN_STATUS, &status,
- -1);
- if (status == TSH_FILE_STATUS_UNVERSIONED)
+ parent_status = get_parent_status (model, iter);
+
+ switch (parent_status)
{
- unversioned_enabled = FALSE;
- enabled = TRUE;
+ case TSH_FILE_STATUS_UNCHANGED:
+ enabled = !((struct select_context*)ctx)->select;
+ break;
+ case TSH_FILE_STATUS_ADDED:
+ if (((struct select_context*)ctx)->dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ enabled = !((struct select_context*)ctx)->select;
+ else
+ enabled = status == TSH_FILE_STATUS_UNVERSIONED && ((struct select_context*)ctx)->select;
+ break;
+ case TSH_FILE_STATUS_DELETED:
+ enabled = !(((struct select_context*)ctx)->dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN) && !((struct select_context*)ctx)->select;
+ break;
+ case TSH_FILE_STATUS_UNVERSIONED:
+ enabled = FALSE;
+ break;
+ case TSH_FILE_STATUS_OTHER:
+ enabled = status == TSH_FILE_STATUS_UNVERSIONED || (status == TSH_FILE_STATUS_MISSING && !(((struct select_context*)ctx)->dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)) || !((struct select_context*)ctx)->select;
+ break;
+ case TSH_FILE_STATUS_MISSING:
+ case TSH_FILE_STATUS_INVALID:
+ break;
}
- }
- if (enabled)
gtk_tree_store_set (GTK_TREE_STORE (model), iter,
- COLUMN_SELECTION, GPOINTER_TO_INT (selection),
+ COLUMN_SELECTION, ((struct select_context*)ctx)->select,
COLUMN_NON_RECURSIVE, FALSE,
- COLUMN_ENABLED, unversioned_enabled,
+ COLUMN_ENABLED, enabled,
-1);
+ }
+
return FALSE;
}
@@ -531,7 +683,7 @@ move_info (GtkTreeStore *store, GtkTreeIter *dest, GtkTreeIter *src)
}
static void
-add_unversioned (GtkTreeStore *model, const gchar *path, gboolean select, gboolean enabled)
+add_unversioned (GtkTreeStore *model, const gchar *path, gboolean select_, gboolean enabled)
{
GDir *dir = g_dir_open (path, 0, NULL);
if (dir)
@@ -546,12 +698,12 @@ add_unversioned (GtkTreeStore *model, const gchar *path, gboolean select, gboole
COLUMN_PATH, file_path,
COLUMN_TEXT_STAT, "",
COLUMN_PROP_STAT, "",
- COLUMN_SELECTION, select,
+ COLUMN_SELECTION, select_,
COLUMN_NON_RECURSIVE, FALSE,
COLUMN_ENABLED, enabled,
COLUMN_STATUS, TSH_FILE_STATUS_UNVERSIONED,
-1);
- add_unversioned (model, file_path, select, FALSE);
+ add_unversioned (model, file_path, select_, FALSE);
g_free (file_path);
}
g_dir_close (dir);
@@ -559,18 +711,103 @@ add_unversioned (GtkTreeStore *model, const gchar *path, gboolean select, gboole
}
static void
-set_children_status (GtkTreeStore *model, GtkTreeIter *parent, gboolean select, gboolean enabled)
+set_children_status (TshFileSelectionDialog *dialog, GtkTreeStore *model, GtkTreeIter *parent, gboolean select_, gboolean enabled)
+{
+ gint parent_status;
+ GtkTreeIter iter;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (model), parent,
+ COLUMN_STATUS, &parent_status,
+ -1);
+
+ if (gtk_tree_model_iter_children (GTK_TREE_MODEL (model), &iter, parent))
+ do
+ {
+ gboolean selection;
+ gboolean non_recursive;
+ gboolean enable;
+ gint status;
+ gtk_tree_model_get (GTK_TREE_MODEL (model), &iter,
+ COLUMN_SELECTION, &selection,
+ COLUMN_NON_RECURSIVE, &non_recursive,
+ COLUMN_STATUS, &status,
+ -1);
+ switch (parent_status)
+ {
+ case TSH_FILE_STATUS_ADDED:
+ switch (status)
+ {
+ case TSH_FILE_STATUS_UNVERSIONED:
+ enable = select_;
+ if (!select_)
+ selection = FALSE;
+ break;
+ default:
+ enable = enabled;
+ selection = select_;
+ break;
+ }
+ break;
+ default:
+ enable = enabled;
+ switch (status)
+ {
+ case TSH_FILE_STATUS_UNVERSIONED:
+ if (select_)
+ continue;
+ break;
+ case TSH_FILE_STATUS_MISSING:
+ if (select_ && !(dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN))
+ continue;
+ break;
+ default:
+ selection = select_;
+ }
+ break;
+ }
+ if (!enable)
+ non_recursive = FALSE;
+ gtk_tree_store_set (model, &iter,
+ COLUMN_SELECTION, selection,
+ COLUMN_NON_RECURSIVE, non_recursive,
+ COLUMN_ENABLED, enable,
+ -1);
+ switch (status)
+ {
+ case TSH_FILE_STATUS_UNVERSIONED:
+ if (!non_recursive)
+ set_children_status_unversioned (model, &iter, selection, FALSE);
+ break;
+ case TSH_FILE_STATUS_DELETED:
+ if (dialog->flags & TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN)
+ {
+ set_children_status (dialog, model, &iter, selection, non_recursive && selection);
+ break;
+ }
+ case TSH_FILE_STATUS_UNCHANGED:
+ set_children_status (dialog, model, &iter, selection, non_recursive || !selection);
+ break;
+ default:
+ set_children_status (dialog, model, &iter, selection, non_recursive);
+ break;
+ }
+ }
+ while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
+}
+
+static void
+set_children_status_unversioned (GtkTreeStore *model, GtkTreeIter *parent, gboolean select_, gboolean enabled)
{
GtkTreeIter iter;
if (gtk_tree_model_iter_children (GTK_TREE_MODEL (model), &iter, parent))
do
{
gtk_tree_store_set (model, &iter,
- COLUMN_SELECTION, select,
+ COLUMN_SELECTION, select_,
COLUMN_NON_RECURSIVE, FALSE,
COLUMN_ENABLED, enabled,
-1);
- set_children_status (model, &iter, select, FALSE);
+ set_children_status_unversioned (model, &iter, select_, FALSE);
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
}
diff --git a/tvp-svn-helper/tsh-file-selection-dialog.h b/tvp-svn-helper/tsh-file-selection-dialog.h
index 0eaf7cc..41534a1 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.h
+++ b/tvp-svn-helper/tsh-file-selection-dialog.h
@@ -32,12 +32,20 @@ typedef enum {
TSH_FILE_SELECTION_FLAG_IGNORED = 1<<4,
TSH_FILE_SELECTION_FLAG_CONFLICTED = 1<<5,
- TSH_FILE_SELECTION_FLAG_AUTO_SELECT_UNVERSIONED = 1<<6
+ TSH_FILE_SELECTION_FLAG_AUTO_SELECT_UNVERSIONED = 1<<6,
+ TSH_FILE_SELECTION_FLAG_AUTO_SELECT_MISSING = 1<<7,
+
+ TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN = 1<<8
} TshFileSelectionFlags;
typedef enum {
- TSH_FILE_STATUS_OTHER = 0,
- TSH_FILE_STATUS_UNVERSIONED
+ TSH_FILE_STATUS_INVALID = 0,
+ TSH_FILE_STATUS_UNCHANGED,
+ TSH_FILE_STATUS_ADDED,
+ TSH_FILE_STATUS_DELETED,
+ TSH_FILE_STATUS_MISSING,
+ TSH_FILE_STATUS_UNVERSIONED,
+ TSH_FILE_STATUS_OTHER
} TshFileStatus;
typedef enum {
@@ -72,10 +80,10 @@ GtkWidget* tsh_file_selection_dialog_new (const gchar *title,
apr_pool_t *pool) G_GNUC_MALLOC G_GNUC_INTERNAL;
gchar** tsh_file_selection_dialog_get_files (TshFileSelectionDialog *dialog) G_GNUC_WARN_UNUSED_RESULT;
-gchar** tsh_file_selection_dialog_get_files_by_status (TshFileSelectionDialog *dialog, TshFileStatus status) G_GNUC_WARN_UNUSED_RESULT;
+gchar** tsh_file_selection_dialog_get_files_by_status (TshFileSelectionDialog *dialog, TshFileStatus status, gboolean indirect) G_GNUC_WARN_UNUSED_RESULT;
GSList* tsh_file_selection_dialog_get_file_info (TshFileSelectionDialog *dialog) G_GNUC_WARN_UNUSED_RESULT;
-GSList* tsh_file_selection_dialog_get_file_info_by_status (TshFileSelectionDialog *dialog, TshFileStatus status) G_GNUC_WARN_UNUSED_RESULT;
+GSList* tsh_file_selection_dialog_get_file_info_by_status (TshFileSelectionDialog *dialog, TshFileStatus status, gboolean indirect) G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS;
diff --git a/tvp-svn-helper/tsh-lock-dialog.c b/tvp-svn-helper/tsh-lock-dialog.c
index 4a9ed43..05015df 100644
--- a/tvp-svn-helper/tsh-lock-dialog.c
+++ b/tvp-svn-helper/tsh-lock-dialog.c
@@ -107,11 +107,12 @@ tsh_lock_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags
gchar *
tsh_lock_dialog_get_message (TshLockDialog *dialog)
{
+ GtkTextBuffer *buffer;
GtkTextIter start, end;
g_return_val_if_fail (TSH_IS_LOCK_DIALOG (dialog), NULL);
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view));
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view));
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
diff --git a/tvp-svn-helper/tsh-lock.c b/tvp-svn-helper/tsh-lock.c
index 1702b14..c6eafc5 100644
--- a/tvp-svn-helper/tsh-lock.c
+++ b/tvp-svn-helper/tsh-lock.c
@@ -35,7 +35,7 @@
#include "tsh-notify-dialog.h"
#include "tsh-lock-dialog.h"
-#include "tsh-delete.h"
+#include "tsh-lock.h"
struct thread_args {
svn_client_ctx_t *ctx;
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index 9a4c9e1..0345db3 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -183,7 +183,7 @@ tsh_log_dialog_init (TshLogDialog *dialog)
renderer = gtk_cell_renderer_text_new ();
n_columns = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
- -1, _("File"),
+ -1, _("Path"),
renderer, "text",
FILE_COLUMN_FILE, NULL);
gtk_tree_view_set_expander_column (GTK_TREE_VIEW (file_view), gtk_tree_view_get_column (GTK_TREE_VIEW (file_view), n_columns - 1));
diff --git a/tvp-svn-helper/tsh-log-message-dialog.c b/tvp-svn-helper/tsh-log-message-dialog.c
index 80e6b23..7ed3027 100644
--- a/tvp-svn-helper/tsh-log-message-dialog.c
+++ b/tvp-svn-helper/tsh-log-message-dialog.c
@@ -171,11 +171,12 @@ tsh_log_message_dialog_add (TshLogMessageDialog *dialog, const char *state, cons
gchar *
tsh_log_message_dialog_get_message (TshLogMessageDialog *dialog)
{
+ GtkTextBuffer *buffer;
GtkTextIter start, end;
g_return_val_if_fail (TSH_IS_LOG_MESSAGE_DIALOG (dialog), NULL);
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view));
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view));
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
diff --git a/tvp-svn-helper/tsh-log.c b/tvp-svn-helper/tsh-log.c
index a45b596..d6f34db 100644
--- a/tvp-svn-helper/tsh-log.c
+++ b/tvp-svn-helper/tsh-log.c
@@ -111,7 +111,7 @@ static gpointer log_thread (gpointer user_data)
tsh_log_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Log failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
gdk_threads_leave();
g_free(error_str);
diff --git a/tvp-svn-helper/tsh-move.c b/tvp-svn-helper/tsh-move.c
index 110ee82..5f108a8 100644
--- a/tvp-svn-helper/tsh-move.c
+++ b/tvp-svn-helper/tsh-move.c
@@ -111,11 +111,13 @@ GThread *tsh_move (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
GtkWidget *dialog;
gchar *from;
gchar *to;
+ gboolean isdir = TRUE;
+ gchar *absolute = NULL;
+ DIR *dir;
+ FILE *fp;
from = files?files[0]:"";
- gboolean isdir = TRUE;
- gchar *absolute = NULL;
if(!g_path_is_absolute (from))
{
//TODO: ".."
@@ -123,8 +125,7 @@ GThread *tsh_move (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
absolute = g_build_filename(currdir, (from[0] == '.' && (!from[1] || from[1] == G_DIR_SEPARATOR || from[1] == '/'))?&from[1]:from, NULL);
g_free (currdir);
}
- DIR *dir = opendir(absolute?absolute:from);
- FILE *fp;
+ dir = opendir(absolute?absolute:from);
if(dir)
closedir(dir);
else if((fp = fopen(absolute?absolute:from, "r")))
diff --git a/tvp-svn-helper/tsh-properties-dialog.c b/tvp-svn-helper/tsh-properties-dialog.c
index 6eb6ef9..826ec21 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -181,11 +181,9 @@ tsh_properties_dialog_init (TshPropertiesDialog *dialog)
gtk_widget_show (text_view);
gtk_widget_show (scroll_window);
- dialog->depth = depth = gtk_combo_box_new ();
-
model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT));
- gtk_combo_box_set_model (GTK_COMBO_BOX (depth), model);
+ dialog->depth = depth = gtk_combo_box_new_with_model (model);
/*
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -442,11 +440,12 @@ tsh_properties_dialog_get_selected_key (TshPropertiesDialog *dialog)
gchar *
tsh_properties_dialog_get_value (TshPropertiesDialog *dialog)
{
+ GtkTextBuffer *buffer;
GtkTextIter start, end;
g_return_val_if_fail (TSH_IS_PROPERTIES_DIALOG (dialog), NULL);
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view));
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->text_view));
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
return gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
@@ -464,8 +463,7 @@ tsh_properties_dialog_get_depth (TshPropertiesDialog *dialog)
g_return_val_if_fail (TSH_IS_PROPERTIES_DIALOG (dialog), svn_depth_unknown);
- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->depth), &iter))
- return svn_depth_unknown;
+ g_return_val_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->depth), &iter), svn_depth_unknown);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->depth));
gtk_tree_model_get_value (model, &iter, 1, &value);
@@ -551,11 +549,11 @@ set_clicked (GtkButton *button, gpointer user_data)
gtk_widget_hide (dialog->close);
gtk_widget_show (dialog->cancel);
-
- g_signal_emit (dialog, signals[SIGNAL_SET], 0);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_SET], 0);
}
static void
@@ -566,10 +564,10 @@ delete_clicked (GtkButton *button, gpointer user_data)
gtk_widget_hide (dialog->close);
gtk_widget_show (dialog->cancel);
-
- g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_clear (GTK_LIST_STORE (model));
+
+ g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
}
diff --git a/tvp-svn-helper/tsh-properties.c b/tvp-svn-helper/tsh-properties.c
index 4411568..9b11de7 100644
--- a/tvp-svn-helper/tsh-properties.c
+++ b/tvp-svn-helper/tsh-properties.c
@@ -79,7 +79,7 @@ static gpointer properties_thread (gpointer user_data)
//tsh_properties_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Set property failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
gdk_threads_leave();
g_free(error_str);
@@ -102,7 +102,7 @@ static gpointer properties_thread (gpointer user_data)
tsh_properties_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Properties failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
gdk_threads_leave();
g_free(error_str);
diff --git a/tvp-svn-helper/tsh-relocate-dialog.c b/tvp-svn-helper/tsh-relocate-dialog.c
index 7fadd01..209ade0 100644
--- a/tvp-svn-helper/tsh-relocate-dialog.c
+++ b/tvp-svn-helper/tsh-relocate-dialog.c
@@ -300,6 +300,8 @@ tsh_relocate_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags f
{
gboolean isdir = TRUE;
gchar *absolute = NULL;
+ DIR *dir;
+ FILE *fp;
if(!g_path_is_absolute (local_dir))
{
//TODO: ".."
@@ -307,8 +309,7 @@ tsh_relocate_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags f
absolute = g_build_filename(currdir, (local_dir[0] == '.' && (!local_dir[1] || local_dir[1] == G_DIR_SEPARATOR || local_dir[1] == '/'))?&local_dir[1]:local_dir, NULL);
g_free (currdir);
}
- DIR *dir = opendir(absolute?absolute:local_dir);
- FILE *fp;
+ dir = opendir(absolute?absolute:local_dir);
if(dir)
closedir(dir);
else if((fp = fopen(absolute?absolute:local_dir, "r")))
diff --git a/tvp-svn-helper/tsh-relocate.c b/tvp-svn-helper/tsh-relocate.c
index b82a755..b3ac62e 100644
--- a/tvp-svn-helper/tsh-relocate.c
+++ b/tvp-svn-helper/tsh-relocate.c
@@ -69,7 +69,7 @@ static gpointer relocate_thread (gpointer user_data)
gdk_threads_enter();
gtk_widget_destroy(dialog);
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Relocate failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(dialog), TRUE);
gdk_threads_leave();
g_free(error_str);
diff --git a/tvp-svn-helper/tsh-revert.c b/tvp-svn-helper/tsh-revert.c
index 3adec36..3b1949e 100644
--- a/tvp-svn-helper/tsh-revert.c
+++ b/tvp-svn-helper/tsh-revert.c
@@ -53,7 +53,7 @@ static gpointer revert_thread (gpointer user_data)
apr_pool_t *subpool, *pool = args->pool;
TshNotifyDialog *dialog = args->dialog;
gchar **files = args->files;
- gint size;
+ gint size, i;
gchar *error_str;
g_free (args);
@@ -66,9 +66,9 @@ static gpointer revert_thread (gpointer user_data)
{
paths = apr_array_make (subpool, size, sizeof (const char *));
- while (size--)
+ for (i=0; i < size; i++)
{
- APR_ARRAY_PUSH (paths, const char *) = files[size];
+ APR_ARRAY_PUSH (paths, const char *) = files[i];
}
}
else
@@ -109,7 +109,7 @@ GThread *tsh_revert (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
GtkWidget *dialog;
struct thread_args *args;
- dialog = tsh_file_selection_dialog_new (_("Revert"), NULL, 0, files, TSH_FILE_SELECTION_FLAG_RECURSIVE|TSH_FILE_SELECTION_FLAG_MODIFIED, ctx, pool);
+ dialog = tsh_file_selection_dialog_new (_("Revert"), NULL, 0, files, TSH_FILE_SELECTION_FLAG_RECURSIVE|TSH_FILE_SELECTION_FLAG_MODIFIED|TSH_FILE_SELECTION_FLAG_REVERSE_DISABLE_CHILDREN, ctx, pool);
if(gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
{
gtk_widget_destroy (dialog);
diff --git a/tvp-svn-helper/tsh-status-dialog.c b/tvp-svn-helper/tsh-status-dialog.c
index 6fb6461..e1821fe 100644
--- a/tvp-svn-helper/tsh-status-dialog.c
+++ b/tvp-svn-helper/tsh-status-dialog.c
@@ -156,11 +156,9 @@ tsh_status_dialog_init (TshStatusDialog *dialog)
table = gtk_table_new (3, 2, FALSE);
- dialog->depth = depth = gtk_combo_box_new ();
-
model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT));
- gtk_combo_box_set_model (GTK_COMBO_BOX (depth), model);
+ dialog->depth = depth = gtk_combo_box_new_with_model (model);
/*
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -332,8 +330,7 @@ tsh_status_dialog_get_depth (TshStatusDialog *dialog)
g_return_val_if_fail (TSH_IS_STATUS_DIALOG (dialog), svn_depth_unknown);
- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->depth), &iter))
- return svn_depth_unknown;
+ g_return_val_if_fail (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (dialog->depth), &iter), svn_depth_unknown);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->depth));
gtk_tree_model_get_value (model, &iter, 1, &value);
diff --git a/tvp-svn-helper/tsh-status.c b/tvp-svn-helper/tsh-status.c
index 4c67611..4c71a72 100644
--- a/tvp-svn-helper/tsh-status.c
+++ b/tvp-svn-helper/tsh-status.c
@@ -84,7 +84,7 @@ static gpointer status_thread (gpointer user_data)
tsh_status_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Status failed"));
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), error_str);
+ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
gdk_threads_leave();
g_free(error_str);
diff --git a/tvp-svn-helper/tsh-transfer-dialog.c b/tvp-svn-helper/tsh-transfer-dialog.c
index 26c783b..f91831e 100644
--- a/tvp-svn-helper/tsh-transfer-dialog.c
+++ b/tvp-svn-helper/tsh-transfer-dialog.c
@@ -214,6 +214,8 @@ tsh_transfer_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags f
{
gboolean isdir = TRUE;
gchar *absolute = NULL;
+ DIR *dir;
+ FILE *fp;
if(!g_path_is_absolute (local_dir))
{
//TODO: ".."
@@ -221,8 +223,7 @@ tsh_transfer_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags f
absolute = g_build_filename(currdir, (local_dir[0] == '.' && (!local_dir[1] || local_dir[1] == G_DIR_SEPARATOR || local_dir[1] == '/'))?&local_dir[1]:local_dir, NULL);
g_free (currdir);
}
- DIR *dir = opendir(absolute?absolute:local_dir);
- FILE *fp;
+ dir = opendir(absolute?absolute:local_dir);
if(dir)
closedir(dir);
else if((fp = fopen(absolute?absolute:local_dir, "r")))
More information about the Xfce4-commits
mailing list