[Goodies-commits] r3762 - in thunar-svn-plugin/trunk: po thunar-svn-plugin tsp-svn-helper
Peter de Ridder
peter at xfce.org
Mon Dec 31 01:55:55 CET 2007
Author: peter
Date: 2007-12-31 00:55:55 +0000 (Mon, 31 Dec 2007)
New Revision: 3762
Added:
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.h
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.h
Modified:
thunar-svn-plugin/trunk/po/POTFILES.in
thunar-svn-plugin/trunk/po/fr.po
thunar-svn-plugin/trunk/po/hu.po
thunar-svn-plugin/trunk/po/lv.po
thunar-svn-plugin/trunk/po/nl.po
thunar-svn-plugin/trunk/po/pt_BR.po
thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot
thunar-svn-plugin/trunk/po/ur.po
thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-action.c
thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-backend.c
thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am
thunar-svn-plugin/trunk/tsp-svn-helper/main.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-add.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-checkout.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-cleanup.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-commit.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.h
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-delete.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-export.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-file-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-import.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-log-message-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-login-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-notify-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-revert.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-trust-dialog.c
thunar-svn-plugin/trunk/tsp-svn-helper/tsh-update.c
Log:
* Actions added:
- status
* Common stuff in actions updated
* Updated translations
Modified: thunar-svn-plugin/trunk/po/POTFILES.in
===================================================================
--- thunar-svn-plugin/trunk/po/POTFILES.in 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/POTFILES.in 2007-12-31 00:55:55 UTC (rev 3762)
@@ -16,10 +16,13 @@
tsp-svn-helper/tsh-dialog-common.c
tsp-svn-helper/tsh-export.c
tsp-svn-helper/tsh-file-dialog.c
+tsp-svn-helper/tsh-import.c
tsp-svn-helper/tsh-log-message-dialog.c
tsp-svn-helper/tsh-login-dialog.c
tsp-svn-helper/tsh-notify-dialog.c
tsp-svn-helper/tsh-revert.c
+tsp-svn-helper/tsh-status.c
+tsp-svn-helper/tsh-status-dialog.c
tsp-svn-helper/tsh-transfer-dialog.c
tsp-svn-helper/tsh-trust-dialog.c
tsp-svn-helper/tsh-update.c
Modified: thunar-svn-plugin/trunk/po/fr.po
===================================================================
--- thunar-svn-plugin/trunk/po/fr.po 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/fr.po 2007-12-31 00:55:55 UTC (rev 3762)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: xfce-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+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"
@@ -36,81 +36,82 @@
msgid "SVN _Export"
msgstr "SVN _Importer"
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr "Ajouter"
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr "Différences détaillées"
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr "Nettoyer les verrous"
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr "Envoyer"
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr "Effacer"
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr "Différences"
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr "Exporter"
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr "Information"
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr "Bloquer"
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr "Journal"
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr "Éditer les propriétés"
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr "Fixer comme résolu"
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr "Restaurer"
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr "État"
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr "Modifier l'adresse du dépôt"
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr "Débloquer"
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr "Mettre à jour"
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr ""
@@ -172,129 +173,141 @@
msgid "Other..."
msgstr ""
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr "Afficher l'information sur la version"
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
#, fuzzy
msgid "Execute add action"
msgstr "Exécuter une mise à jour"
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr "Exécuter une extraction"
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
#, fuzzy
msgid "Execute cleanup action"
msgstr "Exécuter une extraction"
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
#, fuzzy
msgid "Execute commit action"
msgstr "Exécuter une extraction"
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
#, fuzzy
msgid "Execute delete action"
msgstr "Exécuter une mise à jour"
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
#, fuzzy
msgid "Execute export action"
msgstr "Exécuter une extraction"
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
#, fuzzy
msgid "Execute import action"
msgstr "Exécuter une extraction"
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
#, fuzzy
msgid "Execute revert action"
msgstr "Exécuter une extraction"
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+#, fuzzy
+msgid "Execute status action"
+msgstr "Exécuter une mise à jour"
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr "Exécuter une mise à jour"
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
msgid "Checkout"
msgstr "Extraction"
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
#, fuzzy
msgid "Import"
msgstr "SVN _Importer"
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr ""
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
#, fuzzy
msgid "Cleaning up ..."
msgstr "Nettoyer les verrous"
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
#, fuzzy
msgid "Commit Message"
msgstr "Envoyer"
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr "Ajouté"
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
#, fuzzy
msgid "Copied"
msgstr "Complété"
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr "Effacé"
@@ -331,14 +344,17 @@
msgstr "Complété"
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr "Externe"
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr ""
@@ -351,7 +367,7 @@
msgid "Locked"
msgstr "Bloquer"
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
#, fuzzy
msgid "Unlocked"
msgstr "Débloquer"
@@ -365,16 +381,49 @@
msgid "Unlock failed"
msgstr "Débloquer"
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr ""
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:525
+#, fuzzy
+msgid "Conflicted"
+msgstr "Complété"
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr ""
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:529
+#, fuzzy
+msgid "Incomplete"
+msgstr "Complété"
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr "À la révision : %li"
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
#, fuzzy
msgid "Delete Message"
msgstr "Envoyer"
@@ -397,13 +446,19 @@
msgid "Certificate"
msgstr "Notification"
+#: tsp-svn-helper/tsh-import.c:109
+#, fuzzy
+msgid "Import Message"
+msgstr "Envoyer"
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
#, fuzzy
msgid "State"
msgstr "État"
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr "Chemin"
@@ -423,18 +478,30 @@
msgid "Login"
msgstr "Se connecter"
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr "Action"
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Type mime"
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notification"
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/hu.po
===================================================================
--- thunar-svn-plugin/trunk/po/hu.po 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/hu.po 2007-12-31 00:55:55 UTC (rev 3762)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Thunar SVN plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+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"
@@ -32,81 +32,82 @@
msgid "SVN _Export"
msgstr "SVN _Import"
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr "Hozzáad"
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr "Tisztít"
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr "Töröl"
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr "Különbség"
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr "Export"
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr "Adatok"
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr "Zár"
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr "Napló"
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr "Tulajdonságok szerkesztése"
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr "Megold"
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr "Visszaállít"
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr "Állapot"
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr "Vált"
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr "Felold"
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr "Frissít"
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr ""
@@ -168,129 +169,141 @@
msgid "Other..."
msgstr ""
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr "Verzió kiírása"
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
#, fuzzy
msgid "Execute add action"
msgstr "Frissítési művelet futtatása"
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr "Checkout művelet futtatása"
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
#, fuzzy
msgid "Execute cleanup action"
msgstr "Checkout művelet futtatása"
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
#, fuzzy
msgid "Execute commit action"
msgstr "Checkout művelet futtatása"
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
#, fuzzy
msgid "Execute delete action"
msgstr "Frissítési művelet futtatása"
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
#, fuzzy
msgid "Execute export action"
msgstr "Checkout művelet futtatása"
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
#, fuzzy
msgid "Execute import action"
msgstr "Checkout művelet futtatása"
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
#, fuzzy
msgid "Execute revert action"
msgstr "Checkout művelet futtatása"
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+#, fuzzy
+msgid "Execute status action"
+msgstr "Frissítési művelet futtatása"
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr "Frissítési művelet futtatása"
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
#, fuzzy
msgid "Checkout"
msgstr "SVN _Checkout"
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
#, fuzzy
msgid "Import"
msgstr "SVN _Import"
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr ""
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
#, fuzzy
msgid "Cleaning up ..."
msgstr "Tisztít"
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
msgid "Commit Message"
msgstr ""
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr "Hozzáadva"
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
#, fuzzy
msgid "Copied"
msgstr "Kész"
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr "Törölve"
@@ -327,14 +340,17 @@
msgstr "Kész"
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr "Külső"
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr ""
@@ -347,7 +363,7 @@
msgid "Locked"
msgstr "Zár"
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
#, fuzzy
msgid "Unlocked"
msgstr "Felold"
@@ -361,16 +377,49 @@
msgid "Unlock failed"
msgstr "Felold"
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr ""
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:525
+#, fuzzy
+msgid "Conflicted"
+msgstr "Kész"
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr ""
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:529
+#, fuzzy
+msgid "Incomplete"
+msgstr "Kész"
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr "E verziónál: %li"
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
#, fuzzy
msgid "Delete Message"
msgstr "Töröl"
@@ -392,13 +441,19 @@
msgid "Certificate"
msgstr ""
+#: tsp-svn-helper/tsh-import.c:109
+#, fuzzy
+msgid "Import Message"
+msgstr "Töröl"
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
#, fuzzy
msgid "State"
msgstr "Állapot"
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr "Útvonal"
@@ -418,18 +473,30 @@
msgid "Login"
msgstr "Bejelentkezés"
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr "Művelet"
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime típus"
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr ""
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/lv.po
===================================================================
--- thunar-svn-plugin/trunk/po/lv.po 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/lv.po 2007-12-31 00:55:55 UTC (rev 3762)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+0100\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"
@@ -34,81 +34,82 @@
msgid "SVN _Export"
msgstr "SVN _Imports"
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr "Pievienot"
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr "Vainot"
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr "Uzkopt"
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr "Apstiprināt"
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr "Dzēst"
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr "Atšķirība"
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr "Eksportēt"
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr "Informācija"
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr "Slēgt"
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr "Reģistrēt"
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr "Rediģēt Rekvizītus"
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr "Atpazīt"
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr "Atgriezt"
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr "Status"
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr "Pārslēgt"
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr "Atslēgt"
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr "Atjaunot"
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr ""
@@ -170,129 +171,141 @@
msgid "Other..."
msgstr ""
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr "Izdrukāt versijas informāciju"
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
#, fuzzy
msgid "Execute add action"
msgstr "Izpildīt atjaunošanas darbību"
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr "Izpildīt izrakstīšanas darbību"
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
#, fuzzy
msgid "Execute cleanup action"
msgstr "Izpildīt izrakstīšanas darbību"
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
#, fuzzy
msgid "Execute commit action"
msgstr "Izpildīt izrakstīšanas darbību"
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
#, fuzzy
msgid "Execute delete action"
msgstr "Izpildīt atjaunošanas darbību"
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
#, fuzzy
msgid "Execute export action"
msgstr "Izpildīt izrakstīšanas darbību"
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
#, fuzzy
msgid "Execute import action"
msgstr "Izpildīt izrakstīšanas darbību"
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
#, fuzzy
msgid "Execute revert action"
msgstr "Izpildīt izrakstīšanas darbību"
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+#, fuzzy
+msgid "Execute status action"
+msgstr "Izpildīt atjaunošanas darbību"
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr "Izpildīt atjaunošanas darbību"
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
msgid "Checkout"
msgstr "Izrakstīt"
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
#, fuzzy
msgid "Import"
msgstr "SVN _Imports"
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr ""
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
#, fuzzy
msgid "Cleaning up ..."
msgstr "Uzkopt"
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
#, fuzzy
msgid "Commit Message"
msgstr "Apstiprināt"
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr "Pievienots"
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
#, fuzzy
msgid "Copied"
msgstr "Pabeigts"
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr "Dzēsts"
@@ -329,14 +342,17 @@
msgstr "Pabeigts"
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr "Ārējs"
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr ""
@@ -349,7 +365,7 @@
msgid "Locked"
msgstr "Slēgt"
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
#, fuzzy
msgid "Unlocked"
msgstr "Atslēgt"
@@ -363,16 +379,49 @@
msgid "Unlock failed"
msgstr "Atslēgt"
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr ""
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:525
+#, fuzzy
+msgid "Conflicted"
+msgstr "Pabeigts"
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr ""
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:529
+#, fuzzy
+msgid "Incomplete"
+msgstr "Pabeigts"
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr "Revizija: %li"
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
#, fuzzy
msgid "Delete Message"
msgstr "Apstiprināt"
@@ -395,13 +444,19 @@
msgid "Certificate"
msgstr "Paziņošana"
+#: tsp-svn-helper/tsh-import.c:109
+#, fuzzy
+msgid "Import Message"
+msgstr "Apstiprināt"
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
#, fuzzy
msgid "State"
msgstr "Status"
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr "Ceļš"
@@ -421,18 +476,30 @@
msgid "Login"
msgstr "Pieteikties"
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr "Darbība"
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime tips"
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Paziņošana"
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/nl.po
===================================================================
--- thunar-svn-plugin/trunk/po/nl.po 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/nl.po 2007-12-31 00:55:55 UTC (rev 3762)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
-"PO-Revision-Date: 2007-12-30 01:09+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+0100\n"
+"PO-Revision-Date: 2007-12-31 01:59+0100\n"
"Last-Translator: Peter de Ridder <peter at xfce.org>\n"
"Language-Team: Dutch <xfce-i18n at xfce.org>\n"
"MIME-Version: 1.0\n"
@@ -33,81 +33,82 @@
msgid "SVN _Export"
msgstr "SVN _Exporteren"
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr "Toevoegen"
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr "Beschuldigen"
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr "Opschonen"
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr "Versturen"
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr "Verwijderen"
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr "Verschillen"
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr "Exporteren"
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr "Informatie"
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr "Vast Zetten"
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr "Geschiedenis"
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr "Attributen Wijzigen"
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr "Verhelpen"
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr "Terug Halen"
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr "Status"
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr "Omschakelen"
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr "Vrijgeven"
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr "Bijwerken"
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr "Actie %s is niet geimplementeerd"
@@ -169,118 +170,129 @@
msgid "Other..."
msgstr "Andere..."
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr "Versie informatie tonen"
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
msgid "Execute add action"
msgstr "Toevoeg actie uitvoeren"
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr "Ophaal actie uitvoeren"
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
msgid "Execute cleanup action"
msgstr "Opschoon actie uitvoeren"
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
msgid "Execute commit action"
msgstr "Verstuur actie uitvoeren"
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
msgid "Execute delete action"
msgstr "Verwijder actie uitvoeren"
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
msgid "Execute export action"
msgstr "Exporteer actie uitvoeren"
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
msgid "Execute import action"
msgstr "Importeer actie uitvoeren"
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
msgid "Execute revert action"
msgstr "Terug haal actie uitvoeren"
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+msgid "Execute status action"
+msgstr "Status actie uitvoeren"
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr "Bijwerk actie uitvoeren"
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr "Toevoegen gerelateerde opties:"
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr "Ophalen gerelateerde opties:"
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
msgid "Checkout"
msgstr "Ophalen"
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr "Opschonen gerelateerde opties:"
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr "Versturen gerelateerde opties:"
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr "Verwijder gerelateerde opties:"
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr "Exporteer gerelateerde opties:"
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr "Importeer gerelateerde opties:"
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
msgid "Import"
msgstr "Importeren"
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr "Terug haal gerelateerde opties:"
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr "Status gerelateerde opties:"
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr "Bijwerken gerelateerde opties:"
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr "Onvoldoende argumenten meegegeven"
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr "Klaar met opschonen"
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
msgid "Cleaning up ..."
msgstr "Bezig met opschonen ..."
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
msgid "Commit Message"
msgstr ""
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr "Toegevoegd"
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
msgid "Copied"
msgstr "Gekopieerd"
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr "Verwijderd"
@@ -313,14 +325,17 @@
msgstr "Voltooid"
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr "Extern"
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr "Aangepast"
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr "Vervangen"
@@ -332,7 +347,7 @@
msgid "Locked"
msgstr "Vast gezet"
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
msgid "Unlocked"
msgstr "Vrijgegeven"
@@ -344,16 +359,47 @@
msgid "Unlock failed"
msgstr "Vrijgeven gefaald"
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr "Onbekend"
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr "Normaal"
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr "Vermist"
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr "Samengevoegd"
+
+#: tsp-svn-helper/tsh-common.c:525
+msgid "Conflicted"
+msgstr "Conflicten"
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr "Genegeerd"
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr "Geblokkeerd"
+
+#: tsp-svn-helper/tsh-common.c:529
+msgid "Incomplete"
+msgstr "Incompleet"
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr "Op versie: %li"
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
msgid "Delete Message"
msgstr ""
@@ -374,12 +420,17 @@
msgid "Certificate"
msgstr "Certificaat"
+#: tsp-svn-helper/tsh-import.c:109
+msgid "Import Message"
+msgstr ""
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
msgid "State"
msgstr "Status"
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr "Pad"
@@ -399,18 +450,30 @@
msgid "Login"
msgstr "Aanmelden"
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr "Actie"
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr ""
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificatie"
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr "Ongewijzigde bestanden weergeven"
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr "Onbeheerde bestanden weergeven"
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/pt_BR.po
===================================================================
--- thunar-svn-plugin/trunk/po/pt_BR.po 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/pt_BR.po 2007-12-31 00:55:55 UTC (rev 3762)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+0100\n"
"PO-Revision-Date: 2007-11-09 15:08-0300\n"
"Last-Translator: Fábio Nogueira <deb-user-ba at ubuntu.com>\n"
"Language-Team: Brazilian Portuguese <ldp-br at bazar2.conectiva.com.br>\n"
@@ -35,81 +35,82 @@
msgid "SVN _Export"
msgstr "_Importar SVN"
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr "Adicionar"
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr "Falha"
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr "Limpar"
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr "Enviar"
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr "Apagar"
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr "Diferença"
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr "Exportar"
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr "Informações"
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr "Travar"
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr "Log"
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr "Editar Propriedades"
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr "Resolver"
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr "Reverter"
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr "Status"
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr "Alternar"
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr "Destravar"
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr "Atualizar"
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr ""
@@ -171,129 +172,141 @@
msgid "Other..."
msgstr ""
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr "Imprimir informação da versão"
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
#, fuzzy
msgid "Execute add action"
msgstr "Executar ação de atualização"
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr "Executar ação de checkout"
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
#, fuzzy
msgid "Execute cleanup action"
msgstr "Executar ação de checkout"
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
#, fuzzy
msgid "Execute commit action"
msgstr "Executar ação de checkout"
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
#, fuzzy
msgid "Execute delete action"
msgstr "Executar ação de atualização"
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
#, fuzzy
msgid "Execute export action"
msgstr "Executar ação de checkout"
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
#, fuzzy
msgid "Execute import action"
msgstr "Executar ação de checkout"
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
#, fuzzy
msgid "Execute revert action"
msgstr "Executar ação de checkout"
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+#, fuzzy
+msgid "Execute status action"
+msgstr "Executar ação de atualização"
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr "Executar ação de atualização"
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
msgid "Checkout"
msgstr "Checkout"
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
#, fuzzy
msgid "Import"
msgstr "_Importar SVN"
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr ""
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
#, fuzzy
msgid "Cleaning up ..."
msgstr "Limpar"
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
#, fuzzy
msgid "Commit Message"
msgstr "Enviar"
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr "Adicionado"
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
#, fuzzy
msgid "Copied"
msgstr "Completado"
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr "Apagado"
@@ -330,14 +343,17 @@
msgstr "Completado"
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr "Externo"
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr ""
@@ -350,7 +366,7 @@
msgid "Locked"
msgstr "Travar"
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
#, fuzzy
msgid "Unlocked"
msgstr "Destravar"
@@ -364,16 +380,49 @@
msgid "Unlock failed"
msgstr "Destravar"
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr ""
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:525
+#, fuzzy
+msgid "Conflicted"
+msgstr "Completado"
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr ""
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:529
+#, fuzzy
+msgid "Incomplete"
+msgstr "Completado"
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr "Na revisão: %li"
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
#, fuzzy
msgid "Delete Message"
msgstr "Enviar"
@@ -396,13 +445,19 @@
msgid "Certificate"
msgstr "Notificação"
+#: tsp-svn-helper/tsh-import.c:109
+#, fuzzy
+msgid "Import Message"
+msgstr "Enviar"
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
#, fuzzy
msgid "State"
msgstr "Status"
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr "Caminho"
@@ -422,18 +477,30 @@
msgid "Login"
msgstr "Login"
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr "Ação"
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Tipo mime"
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "Notificação"
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot
===================================================================
--- thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/thunar-svn-plugin.pot 2007-12-31 00:55:55 UTC (rev 3762)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+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"
@@ -34,81 +34,82 @@
msgid "SVN _Export"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr ""
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr ""
@@ -170,118 +171,129 @@
msgid "Other..."
msgstr ""
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr ""
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
msgid "Execute add action"
msgstr ""
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr ""
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
msgid "Execute cleanup action"
msgstr ""
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
msgid "Execute commit action"
msgstr ""
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
msgid "Execute delete action"
msgstr ""
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
msgid "Execute export action"
msgstr ""
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
msgid "Execute import action"
msgstr ""
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
msgid "Execute revert action"
msgstr ""
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+msgid "Execute status action"
+msgstr ""
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr ""
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
msgid "Checkout"
msgstr ""
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
msgid "Import"
msgstr ""
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr ""
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
msgid "Cleaning up ..."
msgstr ""
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
msgid "Commit Message"
msgstr ""
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
msgid "Copied"
msgstr ""
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr ""
@@ -314,14 +326,17 @@
msgstr ""
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr ""
@@ -333,7 +348,7 @@
msgid "Locked"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
msgid "Unlocked"
msgstr ""
@@ -345,16 +360,47 @@
msgid "Unlock failed"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr ""
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:525
+msgid "Conflicted"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr ""
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:529
+msgid "Incomplete"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr ""
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
msgid "Delete Message"
msgstr ""
@@ -375,12 +421,17 @@
msgid "Certificate"
msgstr ""
+#: tsp-svn-helper/tsh-import.c:109
+msgid "Import Message"
+msgstr ""
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
msgid "State"
msgstr ""
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr ""
@@ -400,18 +451,30 @@
msgid "Login"
msgstr ""
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr ""
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr ""
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr ""
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/po/ur.po
===================================================================
--- thunar-svn-plugin/trunk/po/ur.po 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/po/ur.po 2007-12-31 00:55:55 UTC (rev 3762)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: thunar-svn-plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-30 01:08+0100\n"
+"POT-Creation-Date: 2007-12-31 02:00+0100\n"
"PO-Revision-Date: 2007-10-26 15:12+0500\n"
"Last-Translator: Muhammad Ali Makki <makk.ma at gmail.com>\n"
"Language-Team: Urdu <makki.ma at gmail.com>\n"
@@ -37,81 +37,82 @@
msgid "SVN _Export"
msgstr "SVN _درآمد"
-#: thunar-svn-plugin/tsp-svn-action.c:235 tsp-svn-helper/main.c:137
-#: tsp-svn-helper/tsh-add.c:98
+#: thunar-svn-plugin/tsp-svn-action.c:237 tsp-svn-helper/main.c:151
+#: tsp-svn-helper/tsh-add.c:94
msgid "Add"
msgstr "شامل کریں"
-#: thunar-svn-plugin/tsp-svn-action.c:243
+#: thunar-svn-plugin/tsp-svn-action.c:245
msgid "Blame"
msgstr "Blame"
-#: thunar-svn-plugin/tsp-svn-action.c:261 tsp-svn-helper/main.c:145
+#: thunar-svn-plugin/tsp-svn-action.c:263 tsp-svn-helper/main.c:159
msgid "Cleanup"
msgstr "صاف کریں"
-#: thunar-svn-plugin/tsp-svn-action.c:269 tsp-svn-helper/main.c:149
-#: tsp-svn-helper/tsh-commit.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:271 tsp-svn-helper/main.c:163
+#: tsp-svn-helper/tsh-commit.c:101
msgid "Commit"
msgstr "تبصرہ"
-#: thunar-svn-plugin/tsp-svn-action.c:282 tsp-svn-helper/main.c:153
-#: tsp-svn-helper/tsh-delete.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:284 tsp-svn-helper/main.c:167
+#: tsp-svn-helper/tsh-delete.c:101
msgid "Delete"
msgstr "حذف"
-#: thunar-svn-plugin/tsp-svn-action.c:290
+#: thunar-svn-plugin/tsp-svn-action.c:292
msgid "Diff"
msgstr "فرق"
-#: thunar-svn-plugin/tsp-svn-action.c:298 tsp-svn-helper/main.c:157
-#: tsp-svn-helper/tsh-export.c:99 tsp-svn-helper/tsh-export.c:117
+#: thunar-svn-plugin/tsp-svn-action.c:300 tsp-svn-helper/main.c:171
+#: tsp-svn-helper/tsh-export.c:95 tsp-svn-helper/tsh-export.c:113
msgid "Export"
msgstr "برآمد"
-#: thunar-svn-plugin/tsp-svn-action.c:311
+#: thunar-svn-plugin/tsp-svn-action.c:313
msgid "Info"
msgstr "معلومات"
-#: thunar-svn-plugin/tsp-svn-action.c:324
+#: thunar-svn-plugin/tsp-svn-action.c:326
msgid "Lock"
msgstr "قفل"
-#: thunar-svn-plugin/tsp-svn-action.c:332
+#: thunar-svn-plugin/tsp-svn-action.c:334
msgid "Log"
msgstr "Log"
-#: thunar-svn-plugin/tsp-svn-action.c:361
+#: thunar-svn-plugin/tsp-svn-action.c:363
msgid "Edit Properties"
msgstr "خصوصیات مدون کریں"
-#: thunar-svn-plugin/tsp-svn-action.c:371
+#: thunar-svn-plugin/tsp-svn-action.c:373
msgid "Resolve"
msgstr "Resolve"
-#: thunar-svn-plugin/tsp-svn-action.c:379 tsp-svn-helper/main.c:165
-#: tsp-svn-helper/tsh-revert.c:103
+#: thunar-svn-plugin/tsp-svn-action.c:381 tsp-svn-helper/main.c:179
+#: tsp-svn-helper/tsh-revert.c:99
msgid "Revert"
msgstr "واپس"
-#: thunar-svn-plugin/tsp-svn-action.c:387
+#: thunar-svn-plugin/tsp-svn-action.c:389 tsp-svn-helper/main.c:183
+#: tsp-svn-helper/tsh-status-dialog.c:159
msgid "Status"
msgstr "حالت"
-#: thunar-svn-plugin/tsp-svn-action.c:395
+#: thunar-svn-plugin/tsp-svn-action.c:397
msgid "Switch"
msgstr "تبدیل"
-#: thunar-svn-plugin/tsp-svn-action.c:403
+#: thunar-svn-plugin/tsp-svn-action.c:405
msgid "Unlock"
msgstr "غیر مقفل"
-#: thunar-svn-plugin/tsp-svn-action.c:411 tsp-svn-helper/main.c:169
-#: tsp-svn-helper/tsh-update.c:105
+#: thunar-svn-plugin/tsp-svn-action.c:413 tsp-svn-helper/main.c:187
+#: tsp-svn-helper/tsh-status.c:95 tsp-svn-helper/tsh-update.c:101
msgid "Update"
msgstr "تجدید"
-#: thunar-svn-plugin/tsp-svn-action.c:424
+#: thunar-svn-plugin/tsp-svn-action.c:426
#, c-format
msgid "Action %s is unimplemented"
msgstr ""
@@ -173,129 +174,141 @@
msgid "Other..."
msgstr ""
-#: tsp-svn-helper/main.c:72
+#: tsp-svn-helper/main.c:80
msgid "Print version information"
msgstr "ورژن معلومات طبع کریں"
-#: tsp-svn-helper/main.c:79
+#: tsp-svn-helper/main.c:87
#, fuzzy
msgid "Execute add action"
msgstr "تجدید کریں"
-#: tsp-svn-helper/main.c:85
+#: tsp-svn-helper/main.c:93
msgid "Execute checkout action"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:91
+#: tsp-svn-helper/main.c:99
#, fuzzy
msgid "Execute cleanup action"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:97
+#: tsp-svn-helper/main.c:105
#, fuzzy
msgid "Execute commit action"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:103
+#: tsp-svn-helper/main.c:111
#, fuzzy
msgid "Execute delete action"
msgstr "تجدید کریں"
-#: tsp-svn-helper/main.c:109
+#: tsp-svn-helper/main.c:117
#, fuzzy
msgid "Execute export action"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:115
+#: tsp-svn-helper/main.c:123
#, fuzzy
msgid "Execute import action"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:121
+#: tsp-svn-helper/main.c:129
#, fuzzy
msgid "Execute revert action"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:127
+#: tsp-svn-helper/main.c:135
+#, fuzzy
+msgid "Execute status action"
+msgstr "تجدید کریں"
+
+#: tsp-svn-helper/main.c:141
msgid "Execute update action"
msgstr "تجدید کریں"
-#: tsp-svn-helper/main.c:137
+#: tsp-svn-helper/main.c:151
msgid "Add Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141
+#: tsp-svn-helper/main.c:155
msgid "Checkout Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:141 tsp-svn-helper/tsh-checkout.c:90
-#: tsp-svn-helper/tsh-checkout.c:102
+#: tsp-svn-helper/main.c:155 tsp-svn-helper/tsh-checkout.c:86
+#: tsp-svn-helper/tsh-checkout.c:98
msgid "Checkout"
msgstr "چیک کریں"
-#: tsp-svn-helper/main.c:145
+#: tsp-svn-helper/main.c:159
msgid "Cleanup Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:149
+#: tsp-svn-helper/main.c:163
msgid "Commit Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:153
+#: tsp-svn-helper/main.c:167
msgid "Delete Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:157
+#: tsp-svn-helper/main.c:171
msgid "Export Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175
msgid "Import Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:161
+#: tsp-svn-helper/main.c:175 tsp-svn-helper/tsh-import.c:86
+#: tsp-svn-helper/tsh-import.c:104
#, fuzzy
msgid "Import"
msgstr "SVN _درآمد"
-#: tsp-svn-helper/main.c:165
+#: tsp-svn-helper/main.c:179
msgid "Revert Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:169
+#: tsp-svn-helper/main.c:183
+msgid "Status Related Opions:"
+msgstr ""
+
+#: tsp-svn-helper/main.c:187
msgid "Update Related Opions:"
msgstr ""
-#: tsp-svn-helper/main.c:215
+#: tsp-svn-helper/main.c:233
msgid "Not enough arguments provided"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:71
+#: tsp-svn-helper/tsh-cleanup.c:67
msgid "Cleanup finnished"
msgstr ""
-#: tsp-svn-helper/tsh-cleanup.c:84
+#: tsp-svn-helper/tsh-cleanup.c:80
#, fuzzy
msgid "Cleaning up ..."
msgstr "صاف کریں"
-#: tsp-svn-helper/tsh-commit.c:109
+#: tsp-svn-helper/tsh-commit.c:106
#, fuzzy
msgid "Commit Message"
msgstr "تبصرہ"
#: tsp-svn-helper/tsh-common.c:449 tsp-svn-helper/tsh-common.c:458
-#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:558
+#: tsp-svn-helper/tsh-common.c:465 tsp-svn-helper/tsh-common.c:519
+#: tsp-svn-helper/tsh-common.c:614
msgid "Added"
msgstr "شامل کردہ"
-#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:567
+#: tsp-svn-helper/tsh-common.c:450 tsp-svn-helper/tsh-common.c:623
#, fuzzy
msgid "Copied"
msgstr "مکمل"
#: tsp-svn-helper/tsh-common.c:451 tsp-svn-helper/tsh-common.c:457
-#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:560
+#: tsp-svn-helper/tsh-common.c:466 tsp-svn-helper/tsh-common.c:521
+#: tsp-svn-helper/tsh-common.c:616
msgid "Deleted"
msgstr "حذف"
@@ -332,14 +345,17 @@
msgstr "مکمل"
#: tsp-svn-helper/tsh-common.c:461 tsp-svn-helper/tsh-common.c:463
+#: tsp-svn-helper/tsh-common.c:528
msgid "External"
msgstr "خارجی"
-#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:563
+#: tsp-svn-helper/tsh-common.c:464 tsp-svn-helper/tsh-common.c:523
+#: tsp-svn-helper/tsh-common.c:619
msgid "Modified"
msgstr ""
-#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:556
+#: tsp-svn-helper/tsh-common.c:467 tsp-svn-helper/tsh-common.c:522
+#: tsp-svn-helper/tsh-common.c:612
msgid "Replaced"
msgstr ""
@@ -352,7 +368,7 @@
msgid "Locked"
msgstr "قفل"
-#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:569
+#: tsp-svn-helper/tsh-common.c:471 tsp-svn-helper/tsh-common.c:625
#, fuzzy
msgid "Unlocked"
msgstr "غیر مقفل"
@@ -366,16 +382,49 @@
msgid "Unlock failed"
msgstr "غیر مقفل"
-#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:552
+#: tsp-svn-helper/tsh-common.c:476 tsp-svn-helper/tsh-common.c:515
+#: tsp-svn-helper/tsh-common.c:532 tsp-svn-helper/tsh-common.c:608
msgid "Unknown"
msgstr ""
+#. N_("None"),
+#. N_("Unversioned"),
+#: tsp-svn-helper/tsh-common.c:518
+msgid "Normal"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:520
+msgid "Missing"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:524
+msgid "Merged"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:525
+#, fuzzy
+msgid "Conflicted"
+msgstr "مکمل"
+
+#: tsp-svn-helper/tsh-common.c:526
+msgid "Ignored"
+msgstr ""
+
#: tsp-svn-helper/tsh-common.c:527
+msgid "Obstructed"
+msgstr ""
+
+#: tsp-svn-helper/tsh-common.c:529
+#, fuzzy
+msgid "Incomplete"
+msgstr "مکمل"
+
+#: tsp-svn-helper/tsh-common.c:572
#, c-format
msgid "At revision: %li"
msgstr "ورژن: %li"
-#: tsp-svn-helper/tsh-delete.c:109
+#: tsp-svn-helper/tsh-delete.c:106
#, fuzzy
msgid "Delete Message"
msgstr "تبصرہ"
@@ -398,13 +447,19 @@
msgid "Certificate"
msgstr "اطلاعیہ"
+#: tsp-svn-helper/tsh-import.c:109
+#, fuzzy
+msgid "Import Message"
+msgstr "تبصرہ"
+
#: tsp-svn-helper/tsh-log-message-dialog.c:85
#, fuzzy
msgid "State"
msgstr "حالت"
#: tsp-svn-helper/tsh-log-message-dialog.c:91
-#: tsp-svn-helper/tsh-notify-dialog.c:81
+#: tsp-svn-helper/tsh-notify-dialog.c:94
+#: tsp-svn-helper/tsh-status-dialog.c:108
msgid "Path"
msgstr "پاتھ"
@@ -424,18 +479,30 @@
msgid "Login"
msgstr "لاگ ان"
-#: tsp-svn-helper/tsh-notify-dialog.c:75
+#: tsp-svn-helper/tsh-notify-dialog.c:88
msgid "Action"
msgstr "حرکت"
-#: tsp-svn-helper/tsh-notify-dialog.c:87
+#: tsp-svn-helper/tsh-notify-dialog.c:100
msgid "Mime type"
msgstr "Mime قسم"
-#: tsp-svn-helper/tsh-notify-dialog.c:102
+#: tsp-svn-helper/tsh-notify-dialog.c:115
msgid "Notification"
msgstr "اطلاعیہ"
+#: tsp-svn-helper/tsh-status-dialog.c:147
+msgid "Show Unmodified Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:151
+msgid "Show Unversioned Files"
+msgstr ""
+
+#: tsp-svn-helper/tsh-status-dialog.c:155
+msgid "Check Repository"
+msgstr ""
+
#: tsp-svn-helper/tsh-transfer-dialog.c:65
msgid "_Repository:"
msgstr ""
Modified: thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-action.c
===================================================================
--- thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-action.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-action.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -88,6 +88,8 @@
void tsp_action_revert (GtkMenuItem *item, TspSvnAction *action);
+void tsp_action_status (GtkMenuItem *item, TspSvnAction *action);
+
void tsp_action_update (GtkMenuItem *item, TspSvnAction *action);
@@ -385,7 +387,7 @@
if ((tsp_action->property.is_parent && tsp_action->property.parent_version_control) || tsp_action->property.directory_version_control || tsp_action->property.file_version_control)
{
subitem = gtk_menu_item_new_with_label (_("Status"));
- g_signal_connect_after (subitem, "activate", G_CALLBACK (tsp_action_unimplemented), "Status");
+ g_signal_connect_object (subitem, "activate", G_CALLBACK (tsp_action_status), action, G_CONNECT_AFTER);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), subitem);
gtk_widget_show(subitem);
}
@@ -421,7 +423,7 @@
void tsp_action_unimplemented (GtkMenuItem *item, const gchar *action)
{
- GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Action %s is unimplemented"), gettext(action));
+ GtkWidget *dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Action %s is unimplemented"), _(action));
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy(dialog);
}
@@ -1020,6 +1022,80 @@
+void tsp_action_status (GtkMenuItem *item, TspSvnAction *action)
+{
+ guint size, i;
+ gchar **argv;
+ GList *iter;
+ gchar *uri;
+ gchar *filename;
+ gchar *file;
+ gint pid;
+ GError *error = NULL;
+ GdkScreen *screen = gtk_window_get_screen (GTK_WINDOW (action->window));
+
+ iter = action->files;
+
+ size = g_list_length (iter);
+
+ argv = g_new (gchar *, size + 3);
+
+ argv[0] = g_strdup (TSP_SVN_HELPER);
+ argv[1] = g_strdup ("--status");
+ argv[size + 2] = NULL;
+
+ for (i = 0; i < size; i++)
+ {
+ /* determine the URI for the file info */
+ uri = thunarx_file_info_get_uri (iter->data);
+ if (G_LIKELY (uri != NULL))
+ {
+ /* determine the local filename for the URI */
+ filename = g_filename_from_uri (uri, NULL, NULL);
+ if (G_LIKELY (filename != NULL))
+ {
+ file = filename;
+ /* strip the "file://" part of the uri */
+ if (strncmp (file, "file://", 7) == 0)
+ {
+ file += 7;
+ }
+
+ file = g_strdup (file);
+
+ /* remove trailing '/' cause svn can't handle that */
+ if (file[strlen (file) - 1] == '/')
+ {
+ file[strlen (file) - 1] = '\0';
+ }
+
+ argv[i+2] = file;
+
+ /* release the filename */
+ g_free (filename);
+ }
+
+ /* release the URI */
+ g_free (uri);
+ }
+
+ iter = g_list_next (iter);
+ }
+
+ if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, 0, NULL, NULL, &pid, &error))
+ {
+ GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (action->window), GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "Could not spawn \'" TSP_SVN_HELPER "\'");
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s.", error->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_error_free (error);
+ }
+
+ g_strfreev (argv);
+}
+
+
+
void tsp_action_update (GtkMenuItem *item, TspSvnAction *action)
{
guint size, i;
Modified: thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-backend.c
===================================================================
--- thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-backend.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/thunar-svn-plugin/tsp-svn-backend.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -26,7 +26,6 @@
#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
#include <subversion-1/svn_fs.h>
#include <thunar-svn-plugin/tsp-svn-backend.h>
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/Makefile.am 2007-12-31 00:55:55 UTC (rev 3762)
@@ -32,6 +32,8 @@
tsh-import.c \
tsh-revert.h \
tsh-revert.c \
+ tsh-status.h \
+ tsh-status.c \
tsh-update.h \
tsh-update.c \
gtkfilechooserentry.h \
@@ -53,6 +55,8 @@
tsh-trust-dialog.c \
tsh-notify-dialog.h \
tsh-notify-dialog.c \
+ tsh-status-dialog.h \
+ tsh-status-dialog.c \
tsh-log-message-dialog.h \
tsh-log-message-dialog.c \
tsh-transfer-dialog.h \
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/main.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/main.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/main.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -28,10 +28,8 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
#include "tsh-common.h"
#include "tsh-add.h"
@@ -42,12 +40,21 @@
#include "tsh-export.h"
#include "tsh-import.h"
#include "tsh-revert.h"
+#include "tsh-status.h"
#include "tsh-update.h"
+static GThread *thread = NULL;
+
+void tsh_replace_thread (GThread *new_thread)
+{
+ if(thread)
+ g_thread_join (thread);
+
+ thread = new_thread;
+}
+
int main (int argc, char *argv[])
{
- GThread *thread = NULL;
-
/* SVN variables */
apr_pool_t *pool;
svn_error_t *err;
@@ -63,6 +70,7 @@
gboolean export = FALSE;
gboolean import = FALSE;
gboolean revert = FALSE;
+ gboolean status = FALSE;
gboolean update = FALSE;
gchar **files = NULL;
GError *error = NULL;
@@ -122,6 +130,12 @@
{ 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 }
+ };
+
GOptionEntry update_options_table[] =
{
{ "update", '\0', 0, G_OPTION_ARG_NONE, &update, N_("Execute update action"), NULL },
@@ -166,6 +180,10 @@
g_option_group_add_entries(option_group, revert_options_table);
g_option_context_add_group(option_context, option_group);
+ option_group = g_option_group_new("status", N_("Status Related Opions:"), N_("Status"), NULL, NULL);
+ g_option_group_add_entries(option_group, status_options_table);
+ g_option_context_add_group(option_context, option_group);
+
option_group = g_option_group_new("update", N_("Update Related Opions:"), N_("Update"), NULL, NULL);
g_option_group_add_entries(option_group, update_options_table);
g_option_context_add_group(option_context, option_group);
@@ -257,6 +275,11 @@
thread = tsh_revert(files, svn_ctx, pool);
}
+ if(status)
+ {
+ thread = tsh_status(files, svn_ctx, pool);
+ }
+
if(update)
{
thread = tsh_update(files, svn_ctx, pool);
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-add.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-add.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-add.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -96,6 +92,7 @@
struct thread_args *args;
dialog = tsh_notify_dialog_new (_("Add"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->notify_func2 = tsh_notify_func2;
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-checkout.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-checkout.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-checkout.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -100,6 +96,7 @@
gtk_widget_destroy (dialog);
dialog = tsh_notify_dialog_new (_("Checkout"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->notify_func2 = tsh_notify_func2;
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-cleanup.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-cleanup.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-cleanup.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-commit.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-commit.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-commit.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -103,6 +99,7 @@
struct thread_args *args;
dialog = tsh_notify_dialog_new (_("Commit"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->log_msg_func2 = tsh_log_msg_func2;
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -32,7 +32,6 @@
#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
#include <subversion-1/svn_fs.h>
#include "tsh-dialog-common.h"
@@ -40,6 +39,7 @@
#include "tsh-file-dialog.h"
#include "tsh-trust-dialog.h"
#include "tsh-notify-dialog.h"
+#include "tsh-status-dialog.h"
#include "tsh-log-message-dialog.h"
#include "tsh-common.h"
@@ -446,38 +446,38 @@
tsh_action_to_string(svn_wc_notify_action_t action)
{
static const gchar const * const action_table[] = {
- N_("Added"),
- N_("Copied"),
- N_("Deleted"),
- N_("Restored"),
- N_("Reverted"),
- N_("Revert failed"),
- N_("Resolved"),
- N_("Skipped"),
- N_("Deleted"),
- N_("Added"),
- N_("Updated"),
- N_("Completed"),
- N_("External"),
- N_("Completed"),
- N_("External"),
- N_("Modified"),
- N_("Added"),
- N_("Deleted"),
- N_("Replaced"),
- N_("Transmitting"),
- ("Revision"),
- N_("Locked"),
- N_("Unlocked"),
- N_("Lock failed"),
- N_("Unlock failed"),
+ N_("Added"),
+ N_("Copied"),
+ N_("Deleted"),
+ N_("Restored"),
+ N_("Reverted"),
+ N_("Revert failed"),
+ N_("Resolved"),
+ N_("Skipped"),
+ N_("Deleted"),
+ N_("Added"),
+ N_("Updated"),
+ N_("Completed"),
+ N_("External"),
+ N_("Completed"),
+ N_("External"),
+ N_("Modified"),
+ N_("Added"),
+ N_("Deleted"),
+ N_("Replaced"),
+ N_("Transmitting"),
+ ("Revision"),
+ N_("Locked"),
+ N_("Unlocked"),
+ N_("Lock failed"),
+ N_("Unlock failed")
};
const gchar *action_string = N_("Unknown");
switch(action)
{
- case svn_wc_notify_add:
+ case svn_wc_notify_add:
case svn_wc_notify_copy:
case svn_wc_notify_delete:
case svn_wc_notify_restore:
@@ -485,16 +485,16 @@
case svn_wc_notify_failed_revert:
case svn_wc_notify_resolved:
case svn_wc_notify_skip:
- case svn_wc_notify_update_delete:
- case svn_wc_notify_update_add:
- case svn_wc_notify_update_update:
- case svn_wc_notify_update_completed:
- case svn_wc_notify_update_external:
+ case svn_wc_notify_update_delete:
+ case svn_wc_notify_update_add:
+ case svn_wc_notify_update_update:
+ case svn_wc_notify_update_completed:
+ case svn_wc_notify_update_external:
case svn_wc_notify_status_completed:
case svn_wc_notify_status_external:
case svn_wc_notify_commit_modified:
case svn_wc_notify_commit_added:
- case svn_wc_notify_commit_deleted:
+ case svn_wc_notify_commit_deleted:
case svn_wc_notify_commit_replaced:
case svn_wc_notify_commit_postfix_txdelta:
case svn_wc_notify_blame_revision:
@@ -505,9 +505,54 @@
action_string = action_table[action];
break;
}
- return gettext(action_string);
+ return _(action_string);
}
+static const gchar *
+tsh_status_to_string(enum svn_wc_status_kind status)
+{
+ static const gchar const * const status_table[] = {
+ N_("Unknown"),
+ (""),//N_("None"),
+ (""),//N_("Unversioned"),
+ N_("Normal"),
+ N_("Added"),
+ N_("Missing"),
+ N_("Deleted"),
+ N_("Replaced"),
+ N_("Modified"),
+ N_("Merged"),
+ N_("Conflicted"),
+ N_("Ignored"),
+ N_("Obstructed"),
+ N_("External"),
+ N_("Incomplete")
+ };
+
+ const gchar *status_string = N_("Unknown");
+
+ switch(status)
+ {
+ case svn_wc_status_none:
+ case svn_wc_status_unversioned:
+ case svn_wc_status_normal:
+ case svn_wc_status_added:
+ case svn_wc_status_missing:
+ case svn_wc_status_deleted:
+ case svn_wc_status_replaced:
+ case svn_wc_status_modified:
+ case svn_wc_status_merged:
+ case svn_wc_status_conflicted:
+ case svn_wc_status_ignored:
+ case svn_wc_status_obstructed:
+ case svn_wc_status_external:
+ case svn_wc_status_incomplete:
+ status_string = status_table[status];
+ break;
+ }
+ return _(status_string);
+}
+
void
tsh_notify_func2(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
{
@@ -535,6 +580,17 @@
gdk_threads_leave();
}
+void
+tsh_status_func2(void *baton, const char *path, svn_wc_status2_t *status)
+{
+ TshStatusDialog *dialog = TSH_STATUS_DIALOG (baton);
+
+ gdk_threads_enter();
+ if (tsh_status_dialog_get_show_unversioned (dialog) || status->entry)
+ tsh_status_dialog_add(dialog, path, tsh_status_to_string(status->text_status), tsh_status_to_string(status->prop_status), tsh_status_to_string(status->repos_text_status), tsh_status_to_string(status->repos_prop_status));
+ gdk_threads_leave();
+}
+
svn_error_t*
tsh_log_msg_func2(const char **log_msg, const char **tmp_file, const apr_array_header_t *commit_items, void *baton, apr_pool_t *pool)
{
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.h
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.h 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-common.h 2007-12-31 00:55:55 UTC (rev 3762)
@@ -21,11 +21,13 @@
gboolean tsh_init (apr_pool_t**, svn_error_t**);
-void tsh_cancel();
+void tsh_replace_thread (GThread *);
+void tsh_cancel ();
gboolean tsh_create_context (svn_client_ctx_t**, apr_pool_t*, svn_error_t**);
void tsh_notify_func2 (void *, const svn_wc_notify_t *, apr_pool_t *);
+void tsh_status_func2 (void *, const char *, svn_wc_status2_t *);
svn_error_t *tsh_log_msg_func2 (const char **, const char **, const apr_array_header_t *, void *, apr_pool_t *);
gchar *tsh_is_working_copy (const gchar *, apr_pool_t *);
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-delete.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-delete.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-delete.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -103,6 +99,7 @@
struct thread_args *args;
dialog = tsh_notify_dialog_new (_("Delete"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->log_msg_func2 = tsh_log_msg_func2;
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-export.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-export.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-export.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -115,6 +111,7 @@
gtk_widget_destroy (dialog);
dialog = tsh_notify_dialog_new (_("Export"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->notify_func2 = tsh_notify_func2;
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-file-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-file-dialog.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-file-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -124,12 +124,16 @@
gchar*
tsh_file_dialog_get_filename (TshFileDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_FILE_DIALOG (dialog), NULL);
+
return gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->filename));
}
gboolean
tsh_file_dialog_get_may_save (TshFileDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_FILE_DIALOG (dialog), FALSE);
+
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->may_save));
}
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-import.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-import.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-import.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -106,6 +102,7 @@
gtk_widget_destroy (dialog);
dialog = tsh_notify_dialog_new (_("Import"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->log_msg_func2 = tsh_log_msg_func2;
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-log-message-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-log-message-dialog.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-log-message-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -148,6 +148,8 @@
GtkTreeIter iter;
GtkTreePath *path;
+ g_return_if_fail (TSH_IS_LOG_MESSAGE_DIALOG (dialog));
+
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_append (GTK_LIST_STORE (model), &iter);
@@ -166,6 +168,9 @@
tsh_log_message_dialog_get_message (TshLogMessageDialog *dialog)
{
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));
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-login-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-login-dialog.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-login-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -162,18 +162,24 @@
gchar*
tsh_login_dialog_get_username (TshLoginDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_LOGIN_DIALOG (dialog), NULL);
+
return g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->username)));
}
gchar*
tsh_login_dialog_get_password (TshLoginDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_LOGIN_DIALOG (dialog), NULL);
+
return g_strdup(gtk_entry_get_text(GTK_ENTRY(dialog->password)));
}
gboolean
tsh_login_dialog_get_may_save (TshLoginDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_LOGIN_DIALOG (dialog), FALSE);
+
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->may_save));
}
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-notify-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-notify-dialog.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-notify-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -44,9 +44,22 @@
G_DEFINE_TYPE (TshNotifyDialog, tsh_notify_dialog, GTK_TYPE_DIALOG)
+enum {
+ SIGNAL_CANCEL = 0,
+ SIGNAL_COUNT
+};
+
+static guint signals[SIGNAL_COUNT];
+
static void
tsh_notify_dialog_class_init (TshNotifyDialogClass *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);
}
enum {
@@ -142,6 +155,8 @@
GtkTreeIter iter;
GtkTreePath *path;
+ g_return_if_fail (TSH_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);
@@ -160,6 +175,8 @@
void
tsh_notify_dialog_done (TshNotifyDialog *dialog)
{
+ g_return_if_fail (TSH_IS_NOTIFY_DIALOG (dialog));
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
}
@@ -171,5 +188,7 @@
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
+
+ g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-revert.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-revert.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-revert.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -101,6 +97,7 @@
struct thread_args *args;
dialog = tsh_notify_dialog_new (_("Revert"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->notify_func2 = tsh_notify_func2;
Added: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.c (rev 0)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -0,0 +1,279 @@
+/*-
+ * 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 <subversion-1/svn_client.h>
+
+#include "tsh-common.h"
+#include "tsh-status-dialog.h"
+
+static void cancel_clicked (GtkButton*, gpointer);
+static void refresh_clicked (GtkButton*, gpointer);
+
+struct _TshStatusDialog
+{
+ GtkDialog dialog;
+
+ GtkWidget *tree_view;
+ GtkWidget *get_all;
+ GtkWidget *unversioned;
+ GtkWidget *update;
+ GtkWidget *close;
+ GtkWidget *cancel;
+ GtkWidget *refresh;
+};
+
+struct _TshStatusDialogClass
+{
+ GtkDialogClass dialog_class;
+};
+
+G_DEFINE_TYPE (TshStatusDialog, tsh_status_dialog, GTK_TYPE_DIALOG)
+
+enum {
+ SIGNAL_CANCEL = 0,
+ SIGNAL_REFRESH,
+ SIGNAL_COUNT
+};
+
+static guint signals[SIGNAL_COUNT];
+
+static void
+tsh_status_dialog_class_init (TshStatusDialogClass *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_PATH = 0,
+ COLUMN_TEXT_STAT,
+ COLUMN_PROP_STAT,
+ COLUMN_REPO_TEXT_STAT,
+ COLUMN_REPO_PROP_STAT,
+ COLUMN_COUNT
+};
+
+static void
+tsh_status_dialog_init (TshStatusDialog *dialog)
+{
+ GtkWidget *button;
+ GtkWidget *tree_view;
+ GtkWidget *scroll_window;
+ GtkWidget *get_all;
+ GtkWidget *unversioned;
+ GtkWidget *update;
+ GtkCellRenderer *renderer;
+ GtkTreeModel *model;
+
+ 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, _("Path"),
+ renderer, "text",
+ COLUMN_PATH, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, ("State"),
+ renderer, "text",
+ COLUMN_TEXT_STAT, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, ("Prop state"),
+ renderer, "text",
+ COLUMN_PROP_STAT, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, ("Repo state"),
+ renderer, "text",
+ COLUMN_REPO_TEXT_STAT, NULL);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
+ -1, ("Repo prop state"),
+ renderer, "text",
+ COLUMN_REPO_PROP_STAT, 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));
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), model);
+
+ g_object_unref (model);
+
+ gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll_window, TRUE, TRUE, 0);
+ gtk_widget_show (tree_view);
+ gtk_widget_show (scroll_window);
+
+ dialog->get_all = get_all = gtk_check_button_new_with_label (_("Show Unmodified Files"));
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), get_all, FALSE, FALSE, 0);
+ gtk_widget_show (get_all);
+
+ dialog->unversioned = unversioned = gtk_check_button_new_with_label (_("Show Unversioned Files"));
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), unversioned, FALSE, FALSE, 0);
+ gtk_widget_show (unversioned);
+
+ dialog->update = update = gtk_check_button_new_with_label (_("Check Repository"));
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), update, FALSE, FALSE, 0);
+ gtk_widget_show (update);
+
+ gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
+
+ 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);
+
+ dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ gtk_box_pack_end (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*
+tsh_status_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
+{
+ TshStatusDialog *dialog = g_object_new (TSH_TYPE_STATUS_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
+tsh_status_dialog_add (TshStatusDialog *dialog, const char *file, const char *text, const char *prop, const char *repo_text, const char *repo_prop)
+{
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+
+ g_return_if_fail (TSH_IS_STATUS_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_TEXT_STAT, text,
+ COLUMN_PROP_STAT, prop,
+ COLUMN_REPO_TEXT_STAT, repo_text,
+ COLUMN_REPO_PROP_STAT, repo_prop,
+ -1);
+}
+
+void
+tsh_status_dialog_done (TshStatusDialog *dialog)
+{
+ g_return_if_fail (TSH_IS_STATUS_DIALOG (dialog));
+
+ gtk_widget_hide (dialog->cancel);
+ gtk_widget_show (dialog->refresh);
+}
+
+gboolean
+tsh_status_dialog_get_show_unmodified (TshStatusDialog *dialog)
+{
+ g_return_val_if_fail (TSH_IS_STATUS_DIALOG (dialog), FALSE);
+
+ return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->get_all));
+}
+
+gboolean
+tsh_status_dialog_get_show_unversioned (TshStatusDialog *dialog)
+{
+ g_return_val_if_fail (TSH_IS_STATUS_DIALOG (dialog), FALSE);
+
+ return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->unversioned));
+}
+
+gboolean
+tsh_status_dialog_get_check_reposetory (TshStatusDialog *dialog)
+{
+ g_return_val_if_fail (TSH_IS_STATUS_DIALOG (dialog), FALSE);
+
+ return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->update));
+}
+
+static void
+cancel_clicked (GtkButton *button, gpointer user_data)
+{
+ TshStatusDialog *dialog = TSH_STATUS_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;
+ TshStatusDialog *dialog = TSH_STATUS_DIALOG (user_data);
+
+ gtk_widget_hide (dialog->refresh);
+ 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));
+
+ g_signal_emit (dialog, signals[SIGNAL_REFRESH], 0);
+}
+
Added: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.h
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.h (rev 0)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status-dialog.h 2007-12-31 00:55:55 UTC (rev 3762)
@@ -0,0 +1,57 @@
+/*-
+ * 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 __TSH_STATUS_DIALOG_H__
+#define __TSH_STATUS_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _TshStatusDialogClass TshStatusDialogClass;
+typedef struct _TshStatusDialog TshStatusDialog;
+
+#define TSH_TYPE_STATUS_DIALOG (tsh_status_dialog_get_type ())
+#define TSH_STATUS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TSH_TYPE_STATUS_DIALOG, TshStatusDialog))
+#define TSH_STATUS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TSH_TYPE_STATUS_DIALOG, TshStatusDialogClass))
+#define TSH_IS_STATUS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TSH_TYPE_STATUS_DIALOG))
+#define TSH_IS_STATUS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TSH_TYPE_STATUS_DIALOG))
+#define TSH_STATUS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TSH_TYPE_STATUS_DIALOG, TshStatusDialogClass))
+
+GType tsh_status_dialog_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+
+GtkWidget* tsh_status_dialog_new (const gchar *title,
+ GtkWindow *parent,
+ GtkDialogFlags flags) G_GNUC_MALLOC G_GNUC_INTERNAL;
+
+void tsh_status_dialog_add (TshStatusDialog *dialog,
+ const char *path,
+ const char *text,
+ const char *prop,
+ const char *repo_text,
+ const char *repo_prop);
+void tsh_status_dialog_done (TshStatusDialog *dialog);
+
+gboolean tsh_status_dialog_get_show_unmodified (TshStatusDialog *dialog);
+gboolean tsh_status_dialog_get_show_unversioned (TshStatusDialog *dialog);
+gboolean tsh_status_dialog_get_check_reposetory (TshStatusDialog *dialog);
+
+G_END_DECLS;
+
+#endif /* !__TSH_STATUS_DIALOG_H__ */
Added: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.c (rev 0)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -0,0 +1,112 @@
+/*-
+ * 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 <subversion-1/svn_client.h>
+
+#include "tsh-common.h"
+#include "tsh-dialog-common.h"
+#include "tsh-status-dialog.h"
+
+#include "tsh-status.h"
+
+struct thread_args {
+ svn_client_ctx_t *ctx;
+ apr_pool_t *pool;
+ TshStatusDialog *dialog;
+ gchar **files;
+};
+
+static gpointer status_thread (gpointer user_data)
+{
+ struct thread_args *args = user_data;
+ svn_opt_revision_t revision;
+ svn_error_t *err;
+ svn_client_ctx_t *ctx = args->ctx;
+ apr_pool_t *pool = args->pool;
+ TshStatusDialog *dialog = args->dialog;
+ gchar **files = args->files;
+ gboolean get_all;
+ gboolean update;
+
+ gdk_threads_enter();
+ get_all = tsh_status_dialog_get_show_unmodified(dialog);
+ update = tsh_status_dialog_get_check_reposetory(dialog);
+ gdk_threads_leave();
+
+ revision.kind = svn_opt_revision_head;
+ if ((err = svn_client_status2(NULL, files?files[0]:"", &revision, tsh_status_func2, dialog, TRUE, get_all, update, FALSE, FALSE, ctx, pool)))
+ {
+ gdk_threads_enter();
+ tsh_status_dialog_done (dialog);
+ gdk_threads_leave();
+
+ svn_handle_error2(err, stderr, FALSE, G_LOG_DOMAIN ": ");
+ svn_error_clear(err);
+ return GINT_TO_POINTER (FALSE);
+ }
+
+ gdk_threads_enter();
+ tsh_status_dialog_done (dialog);
+ gdk_threads_leave();
+
+ return GINT_TO_POINTER (TRUE);
+}
+
+static void create_status_thread(TshStatusDialog *dialog, struct thread_args *args)
+{
+ GThread *thread = g_thread_create (status_thread, args, TRUE, NULL);
+ if (thread)
+ tsh_replace_thread (thread);
+ else
+ tsh_status_dialog_done (dialog);
+}
+
+GThread *tsh_status (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
+{
+ GtkWidget *dialog;
+ struct thread_args *args;
+
+ dialog = tsh_status_dialog_new (_("Update"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
+ tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
+
+ ctx->notify_func2 = tsh_notify_func2;
+ ctx->notify_baton2 = dialog;
+
+ args = g_malloc (sizeof (struct thread_args));
+ args->ctx = ctx;
+ args->pool = pool;
+ args->dialog = TSH_STATUS_DIALOG (dialog);
+ args->files = files;
+
+ g_signal_connect(dialog, "refresh-clicked", G_CALLBACK(create_status_thread), args);
+
+ return g_thread_create (status_thread, args, TRUE, NULL);
+}
+
Added: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.h
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.h (rev 0)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-status.h 2007-12-31 00:55:55 UTC (rev 3762)
@@ -0,0 +1,27 @@
+/*-
+ * 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
+ */
+
+#ifndef __TSH_STATUS_H__
+#define __TSH_STATUS_H__
+
+G_BEGIN_DECLS
+
+GThread *tsh_status (gchar**, svn_client_ctx_t*, apr_pool_t*);
+
+G_END_DECLS
+
+#endif /*__TSH_STATUS_H__*/
+
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-transfer-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -182,11 +182,15 @@
gchar* tsh_transfer_dialog_get_reposetory (TshTransferDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_TRANSFER_DIALOG (dialog), NULL);
+
return gtk_file_chooser_entry_get_uri(GTK_FILE_CHOOSER_ENTRY(dialog->repository));
}
gchar* tsh_transfer_dialog_get_directory (TshTransferDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_TRANSFER_DIALOG (dialog), NULL);
+
return gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->path));
}
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-trust-dialog.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-trust-dialog.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-trust-dialog.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -131,6 +131,9 @@
tsh_trust_dialog_get_accepted (TshTrustDialog *dialog)
{
guint32 failures = 0;
+
+ g_return_val_if_fail (TSH_IS_TRUST_DIALOG (dialog), failures);
+
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->notyetvalid)))
failures |= SVN_AUTH_SSL_NOTYETVALID;
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->expired)))
@@ -147,6 +150,8 @@
gboolean
tsh_trust_dialog_get_may_save (TshTrustDialog *dialog)
{
+ g_return_val_if_fail (TSH_IS_TRUST_DIALOG (dialog), FALSE);
+
return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->may_save));
}
Modified: thunar-svn-plugin/trunk/tsp-svn-helper/tsh-update.c
===================================================================
--- thunar-svn-plugin/trunk/tsp-svn-helper/tsh-update.c 2007-12-30 00:04:37 UTC (rev 3761)
+++ thunar-svn-plugin/trunk/tsp-svn-helper/tsh-update.c 2007-12-31 00:55:55 UTC (rev 3762)
@@ -27,11 +27,7 @@
#include <thunar-vfs/thunar-vfs.h>
-#include <subversion-1/svn_cmdline.h>
#include <subversion-1/svn_client.h>
-#include <subversion-1/svn_pools.h>
-#include <subversion-1/svn_config.h>
-#include <subversion-1/svn_fs.h>
#include "tsh-common.h"
#include "tsh-dialog-common.h"
@@ -103,6 +99,7 @@
struct thread_args *args;
dialog = tsh_notify_dialog_new (_("Update"), NULL, 0);
+ g_signal_connect(dialog, "cancel-clicked", tsh_cancel, NULL);
tsh_dialog_start (GTK_DIALOG (dialog), TRUE);
ctx->notify_func2 = tsh_notify_func2;
More information about the Goodies-commits
mailing list