[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] branch master updated (fb2878a -> a8bbda8)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from fb2878a Add mnemonics to buttons new a8bbda8 I18n: Update translation zh_TW (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/zh_TW.po | 323 ++-- 1 file changed, 164 insertions(+), 159 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 01/01: I18n: Update translation zh_TW (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. commit a8bbda88d2afdde6be1bb684e7ba74f102619121 Author: Jeff Huang Date: Thu May 31 06:30:28 2018 +0200 I18n: Update translation zh_TW (100%). 334 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/zh_TW.po | 323 ++-- 1 file changed, 164 insertions(+), 159 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 6fd3a9e..48a3009 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Thunar Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-24 06:30+0200\n" -"PO-Revision-Date: 2018-05-24 23:30+\n" +"POT-Creation-Date: 2018-05-30 06:30+0200\n" +"PO-Revision-Date: 2018-05-31 03:10+\n" "Last-Translator: Jeff Huang \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/xfce/thunar-plugins/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -28,8 +28,8 @@ msgstr "選單|增加" #: ../thunar-vcs-plugin/tvp-git-action.c:242 #: ../thunar-vcs-plugin/tvp-svn-action.c:280 ../tvp-git-helper/main.c:153 #: ../tvp-git-helper/tgh-add.c:108 ../tvp-git-helper/tgh-add.c:121 -#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:119 -#: ../tvp-svn-helper/tsh-add.c:132 +#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:135 +#: ../tvp-svn-helper/tsh-add.c:148 msgid "Add" msgstr "增加" @@ -101,7 +101,7 @@ msgstr "選單|提交" #: ../thunar-vcs-plugin/tvp-svn-action.c:312 #: ../tvp-git-helper/tgh-log-dialog.c:153 #: ../tvp-git-helper/tgh-status-dialog.c:97 ../tvp-svn-helper/main.c:279 -#: ../tvp-svn-helper/tsh-commit.c:241 ../tvp-svn-helper/tsh-commit.c:254 +#: ../tvp-svn-helper/tsh-commit.c:260 ../tvp-svn-helper/tsh-commit.c:273 msgid "Commit" msgstr "提交" @@ -112,7 +112,7 @@ msgstr "選單|比對" #: ../thunar-vcs-plugin/tvp-git-action.c:253 #: ../thunar-vcs-plugin/tvp-svn-action.c:327 ../tvp-svn-helper/main.c:291 -#: ../tvp-svn-helper/tsh-diff.c:218 ../tvp-svn-helper/tsh-diff-dialog.c:137 +#: ../tvp-svn-helper/tsh-diff.c:226 ../tvp-svn-helper/tsh-diff-dialog.c:136 msgid "Diff" msgstr "比對" @@ -167,7 +167,7 @@ msgstr "選單|移動" #: ../thunar-vcs-plugin/tvp-git-action.c:260 #: ../thunar-vcs-plugin/tvp-svn-action.c:372 ../tvp-git-helper/main.c:177 -#: ../tvp-svn-helper/main.c:311 ../tvp-svn-helper/tsh-move.c:170 +#: ../tvp-svn-helper/main.c:311 ../tvp-svn-helper/tsh-move.c:174 msgid "Move" msgstr "移動" @@ -238,7 +238,7 @@ msgstr "選單|狀態" #: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-git-helper/main.c:189 #: ../tvp-git-helper/tgh-file-selection-dialog.c:121 #: ../tvp-git-helper/tgh-status-dialog.c:124 ../tvp-svn-helper/main.c:331 -#: ../tvp-svn-helper/tsh-file-selection-dialog.c:151 +#: ../tvp-svn-helper/tsh-file-selection-dialog.c:150 #: ../tvp-svn-helper/tsh-status-dialog.c:246 msgid "Status" msgstr "狀態" @@ -291,7 +291,7 @@ msgid "Menu|Copy" msgstr "選單|複製" #: ../thunar-vcs-plugin/tvp-svn-action.c:317 ../tvp-svn-helper/main.c:283 -#: ../tvp-svn-helper/tsh-copy.c:177 +#: ../tvp-svn-helper/tsh-copy.c:183 msgid "Copy" msgstr "複製" @@ -300,7 +300,7 @@ msgid "Menu|Delete" msgstr "選單|刪除" #: ../thunar-vcs-plugin/tvp-svn-action.c:322 ../tvp-svn-helper/main.c:287 -#: ../tvp-svn-helper/tsh-delete.c:140 ../tvp-svn-helper/tsh-delete.c:153 +#: ../tvp-svn-helper/tsh-delete.c:139 ../tvp-svn-helper/tsh-delete.c:152 msgid "Delete" msgstr "刪除" @@ -309,7 +309,7 @@ msgid "Menu|Export" msgstr "選單|匯出" #: ../thunar-vcs-plugin/tvp-svn-action.c:332 ../tvp-svn-helper/main.c:295 -#: ../tvp-svn-helper/tsh-export.c:114 ../tvp-svn-helper/tsh-export.c:132 +#: ../tvp-svn-helper/tsh-export.c:113 ../tvp-svn-helper/tsh-export.c:131 msgid "Export" msgstr "匯出" @@ -318,7 +318,7 @@ msgid "Menu|Import" msgstr "選單|匯入" #: ../thunar-vcs-plugin/tvp-svn-action.c:337 ../tvp-svn-helper/main.c:299 -#: ../tvp-svn-helper/tsh-import.c:115 ../tvp-svn-helper/tsh-import.c:133 +#: ../tvp-svn-helper/tsh-import.c:120 ../tvp-svn-helper/tsh-import.c:138 msgid "Import" msgstr "匯入" @@ -352,7 +352,7 @@ msgid "Menu|Relocate" msgstr "選單|重新定位" #: ../thunar-vcs-plugin/tvp-svn-action.c:388 ../tvp-svn-helper/main.c:323 -#: ../tvp-svn-helper/tsh-relocate.c:125 +#: ../tvp-svn-helper/tsh-relocate.c:124 #: ../tvp-svn-helper/tsh-relocate-dialog.c:214 msgid "Relocate" msgstr "重新定位" @@ -362,7 +362,7 @@ msgid "Menu|Resolved" msgstr "選單|已解決" #: ../thunar-vcs-plugin/tvp-svn-action.c:394 ../tvp-svn-helper/main.c:319 -#: ../tvp-svn-helper/tsh-common.c:536 ../tvp-svn-helper/tsh-resolved.c:115 +#: ../tvp-svn-helper/tsh-common.c:539 ../tvp-svn-helper/tsh-resolved.c:115 #: ../tvp-svn-helper/tsh-resolved.c:128 msgid "Resolved" msgstr "已解決" @@ -380,7 +380,7 @@ msgid
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] branch master updated (c700ee2 -> fb2878a)
This is an automated email from the git hooks/post-receive script. a n d r e p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from c700ee2 I18n: Update translation da (99%). new fb2878a Add mnemonics to buttons The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: tvp-git-helper/tgh-branch-dialog.c | 2 +- tvp-git-helper/tgh-clean-dialog.c | 2 +- tvp-git-helper/tgh-file-selection-dialog.c | 2 +- tvp-git-helper/tgh-move.c | 2 +- tvp-git-helper/tgh-stash-dialog.c | 2 +- tvp-git-helper/tgh-transfer-dialog.c | 4 ++-- tvp-svn-helper/tsh-copy.c | 2 +- tvp-svn-helper/tsh-file-dialog.c | 2 +- tvp-svn-helper/tsh-file-selection-dialog.c | 2 +- tvp-svn-helper/tsh-lock-dialog.c | 2 +- tvp-svn-helper/tsh-log-message-dialog.c| 2 +- tvp-svn-helper/tsh-login-dialog.c | 2 +- tvp-svn-helper/tsh-move.c | 2 +- tvp-svn-helper/tsh-relocate-dialog.c | 4 ++-- tvp-svn-helper/tsh-transfer-dialog.c | 4 ++-- tvp-svn-helper/tsh-trust-dialog.c | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 01/01: Add mnemonics to buttons
This is an automated email from the git hooks/post-receive script. a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. commit fb2878a19bd51cb98e8ee4a90d018ed807525a3c Author: Andre Miranda Date: Wed May 30 23:58:16 2018 -0300 Add mnemonics to buttons --- tvp-git-helper/tgh-branch-dialog.c | 2 +- tvp-git-helper/tgh-clean-dialog.c | 2 +- tvp-git-helper/tgh-file-selection-dialog.c | 2 +- tvp-git-helper/tgh-move.c | 2 +- tvp-git-helper/tgh-stash-dialog.c | 2 +- tvp-git-helper/tgh-transfer-dialog.c | 4 ++-- tvp-svn-helper/tsh-copy.c | 2 +- tvp-svn-helper/tsh-file-dialog.c | 2 +- tvp-svn-helper/tsh-file-selection-dialog.c | 2 +- tvp-svn-helper/tsh-lock-dialog.c | 2 +- tvp-svn-helper/tsh-log-message-dialog.c| 2 +- tvp-svn-helper/tsh-login-dialog.c | 2 +- tvp-svn-helper/tsh-move.c | 2 +- tvp-svn-helper/tsh-relocate-dialog.c | 4 ++-- tvp-svn-helper/tsh-transfer-dialog.c | 4 ++-- tvp-svn-helper/tsh-trust-dialog.c | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tvp-git-helper/tgh-branch-dialog.c b/tvp-git-helper/tgh-branch-dialog.c index 4cb0b74..ddf7928 100644 --- a/tvp-git-helper/tgh-branch-dialog.c +++ b/tvp-git-helper/tgh-branch-dialog.c @@ -127,7 +127,7 @@ tgh_branch_dialog_init (TghBranchDialog *dialog) gtk_widget_show (tree_view); gtk_widget_show (scroll_window); - dialog->checkout = button = gtk_button_new_with_mnemonic (_("Jump to")); + dialog->checkout = button = gtk_button_new_with_mnemonic (_("_Jump to")); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, ""); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (checkout_clicked), dialog); gtk_widget_show (button); diff --git a/tvp-git-helper/tgh-clean-dialog.c b/tvp-git-helper/tgh-clean-dialog.c index fb9fe20..e1b69a2 100644 --- a/tvp-git-helper/tgh-clean-dialog.c +++ b/tvp-git-helper/tgh-clean-dialog.c @@ -97,7 +97,7 @@ tgh_clean_dialog_init (TghCleanDialog *dialog) gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL, - _("OK"), GTK_RESPONSE_OK, + _("_OK"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); diff --git a/tvp-git-helper/tgh-file-selection-dialog.c b/tvp-git-helper/tgh-file-selection-dialog.c index 2c64012..f0f0847 100644 --- a/tvp-git-helper/tgh-file-selection-dialog.c +++ b/tvp-git-helper/tgh-file-selection-dialog.c @@ -122,7 +122,7 @@ tgh_file_selection_dialog_init (TghFileSelectionDialog *dialog) gtk_dialog_add_buttons (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL, - _("OK"), GTK_RESPONSE_OK, + _("_OK"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); diff --git a/tvp-git-helper/tgh-move.c b/tvp-git-helper/tgh-move.c index 084e650..952d8fd 100644 --- a/tvp-git-helper/tgh-move.c +++ b/tvp-git-helper/tgh-move.c @@ -146,7 +146,7 @@ gboolean tgh_move (gchar **files, GPid *pid) dialog = gtk_file_chooser_dialog_new (_("Move To"), NULL, multiple?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:GTK_FILE_CHOOSER_ACTION_SAVE, _("_Cancel"), GTK_RESPONSE_CANCEL, - _("OK"), GTK_RESPONSE_OK, + _("_OK"), GTK_RESPONSE_OK, NULL); if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) diff --git a/tvp-git-helper/tgh-stash-dialog.c b/tvp-git-helper/tgh-stash-dialog.c index 3958f25..8031a69 100644 --- a/tvp-git-helper/tgh-stash-dialog.c +++ b/tvp-git-helper/tgh-stash-dialog.c @@ -238,7 +238,7 @@ tgh_stash_dialog_init (TghStashDialog *dialog) g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (drop_clicked), dialog); gtk_widget_show (button); - dialog->clear = button = gtk_button_new_with_mnemonic (_("Clear")); + dialog->clear = button = gtk_button_new_with_mnemonic (_("C_lear")); gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, ""); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (clear_clicked), dialog); gtk_widget_show (button); diff --git a/tvp-git-helper/tgh-transfer-dialog.c b/tvp-git-helper/tgh-transfer-dialog.c index ced6f71..fb11181 100644 --- a/tvp-git-helper/tgh-transfer-dialog.c +++ b/tvp-git-helper/tgh-transfer-dialog.c @@ -75,7 +75,7 @@ tgh_transfer_dialog_init (TghTransferDialog *dialog) dialog->filechooser = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
[Xfce4-commits] [xfce/xfdesktop] 01/01: I18n: Update translation da (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfdesktop. commit 5b4c2f6a8049a298d7e43b736f380226533666e1 Author: Anonymous Date: Thu May 31 00:32:29 2018 +0200 I18n: Update translation da (100%). 229 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/da.po | 122 ++- 1 file changed, 65 insertions(+), 57 deletions(-) diff --git a/po/da.po b/po/da.po index 9de6d70..35df4ef 100644 --- a/po/da.po +++ b/po/da.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-04 18:31+0200\n" -"PO-Revision-Date: 2018-03-08 15:22+\n" +"POT-Creation-Date: 2018-05-25 06:32+0200\n" +"PO-Revision-Date: 2018-05-30 20:18+\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/xfce/xfdesktop/language/da/)\n" "MIME-Version: 1.0\n" @@ -136,7 +136,7 @@ msgstr "SOKKEL-ID" msgid "Version information" msgstr "Versionsinformation" -#: ../settings/main.c:2101 ../src/xfdesktop-application.c:774 +#: ../settings/main.c:2101 ../src/xfdesktop-application.c:836 msgid "Enable debug messages" msgstr "Aktivér fejlsøgningsbeskeder" @@ -351,7 +351,7 @@ msgstr "Minimerede programikoner" msgid "File/launcher icons" msgstr "Fil-/programopstartsikoner" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1049 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1060 msgid "Desktop" msgstr "Skrivebord" @@ -473,7 +473,7 @@ msgstr "Standardikoner" msgid "_Icons" msgstr "_Ikoner" -#: ../src/menu.c:81 +#: ../src/menu.c:90 msgid "_Applications" msgstr "_Programmer" @@ -530,83 +530,83 @@ msgstr "_Fjern arbejdsområde %d" msgid "_Remove Workspace '%s'" msgstr "F_jern arbejdsområde \"%s\"" -#: ../src/xfdesktop-application.c:766 +#: ../src/xfdesktop-application.c:828 msgid "Display version information" msgstr "Vis versionsinformation" -#: ../src/xfdesktop-application.c:767 +#: ../src/xfdesktop-application.c:829 msgid "Reload all settings" msgstr "Genindlæs alle indstillinger" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:830 msgid "Advance to the next wallpaper on the current workspace" msgstr "Gå videre til det næste tapet på nuværende arbejdsområde" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:831 msgid "Pop up the menu (at the current mouse position)" msgstr "Åbn menuen (på musens nuværende position)" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:832 msgid "Pop up the window list (at the current mouse position)" msgstr "Åbn vindueslisten (på musens nuværende position)" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-application.c:834 msgid "Automatically arrange all the icons on the desktop" msgstr "Sortér automatisk alle ikoner på skrivebordet" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:837 msgid "Disable debug messages" msgstr "Deaktivér fejlsøgningsbeskeder" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:838 msgid "Do not wait for a window manager on startup" msgstr "Vent ikke på vindueshåndtering ved opstart" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:839 msgid "Cause xfdesktop to quit" msgstr "Vil afslutte xfdesktop" -#: ../src/xfdesktop-application.c:792 +#: ../src/xfdesktop-application.c:854 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Kunne ikke fortolke argumenter: %s\n" -#: ../src/xfdesktop-application.c:803 +#: ../src/xfdesktop-application.c:865 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Dette er %s version %s, som kører på Xfce %s.\n" -#: ../src/xfdesktop-application.c:805 +#: ../src/xfdesktop-application.c:867 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Kompileret med GTK+ %d.%d.%d, lænket med GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:871 #, c-format msgid "Build options:\n" msgstr "Kompileringstilvalg:\n" -#: ../src/xfdesktop-application.c:810 +#: ../src/xfdesktop-application.c:872 #, c-format msgid "Desktop Menu:%s\n" msgstr " Skrivebordsmenu: %s\n" -#: ../src/xfdesktop-application.c:812 ../src/xfdesktop-application.c:819 -#: ../src/xfdesktop-application.c:826 +#: ../src/xfdesktop-application.c:874 ../src/xfdesktop-application.c:881 +#: ../src/xfdesktop-application.c:888 msgid "enabled" msgstr "aktiveret" -#: ../src/xfdesktop-application.c:814 ../src/xfdesktop-application.c:821 -#: ../src/xfdesktop-application.c:828 +#:
[Xfce4-commits] [xfce/xfdesktop] branch master updated (46bc6ac -> 5b4c2f6)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository xfce/xfdesktop. from 46bc6ac I18n: Update translation it (100%). new 5b4c2f6 I18n: Update translation da (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/da.po | 122 ++- 1 file changed, 65 insertions(+), 57 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 01/01: I18n: Update translation da (99%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. commit c700ee2acede41779bba79a54fa7451604c8f15d Author: Anonymous Date: Thu May 31 00:30:29 2018 +0200 I18n: Update translation da (99%). 333 translated messages, 1 untranslated message. Transifex (https://www.transifex.com/xfce/public/). --- po/da.po | 718 --- 1 file changed, 415 insertions(+), 303 deletions(-) diff --git a/po/da.po b/po/da.po index 744d7cc..5d7701f 100644 --- a/po/da.po +++ b/po/da.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Thunar Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-17 00:30+0100\n" -"PO-Revision-Date: 2018-03-04 17:14+\n" +"POT-Creation-Date: 2018-05-30 06:30+0200\n" +"PO-Revision-Date: 2018-05-30 20:21+\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/xfce/thunar-plugins/language/da/)\n" "MIME-Version: 1.0\n" @@ -23,397 +23,394 @@ msgstr "" "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../thunar-vcs-plugin/tvp-git-action.c:263 -#: ../thunar-vcs-plugin/tvp-svn-action.c:300 +#: ../thunar-vcs-plugin/tvp-git-action.c:242 +#: ../thunar-vcs-plugin/tvp-svn-action.c:280 msgid "Menu|Add" msgstr "Tilføj" -#: ../thunar-vcs-plugin/tvp-git-action.c:263 -#: ../thunar-vcs-plugin/tvp-svn-action.c:300 ../tvp-git-helper/main.c:153 +#: ../thunar-vcs-plugin/tvp-git-action.c:242 +#: ../thunar-vcs-plugin/tvp-svn-action.c:280 ../tvp-git-helper/main.c:153 #: ../tvp-git-helper/tgh-add.c:108 ../tvp-git-helper/tgh-add.c:121 -#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:119 -#: ../tvp-svn-helper/tsh-add.c:132 +#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:135 +#: ../tvp-svn-helper/tsh-add.c:148 msgid "Add" msgstr "Tilføj" -#: ../thunar-vcs-plugin/tvp-git-action.c:264 +#: ../thunar-vcs-plugin/tvp-git-action.c:243 msgid "Menu|Bisect" msgstr "Bisect" -#: ../thunar-vcs-plugin/tvp-git-action.c:264 +#: ../thunar-vcs-plugin/tvp-git-action.c:243 msgid "Bisect" msgstr "Bisect" -#: ../thunar-vcs-plugin/tvp-git-action.c:266 -#: ../thunar-vcs-plugin/tvp-svn-action.c:305 +#: ../thunar-vcs-plugin/tvp-git-action.c:245 +#: ../thunar-vcs-plugin/tvp-svn-action.c:285 msgid "Menu|Blame" msgstr "Vis ansvarlige" -#: ../thunar-vcs-plugin/tvp-git-action.c:266 -#: ../thunar-vcs-plugin/tvp-svn-action.c:305 ../tvp-git-helper/main.c:157 +#: ../thunar-vcs-plugin/tvp-git-action.c:245 +#: ../thunar-vcs-plugin/tvp-svn-action.c:285 ../tvp-git-helper/main.c:157 #: ../tvp-git-helper/tgh-blame-dialog.c:129 ../tvp-svn-helper/main.c:263 #: ../tvp-svn-helper/main.c:267 ../tvp-svn-helper/tsh-blame-dialog.c:132 msgid "Blame" msgstr "Vis ansvarlige" -#: ../thunar-vcs-plugin/tvp-git-action.c:268 +#: ../thunar-vcs-plugin/tvp-git-action.c:247 msgid "Menu|Branch" msgstr "Gren" -#: ../thunar-vcs-plugin/tvp-git-action.c:268 ../tvp-git-helper/main.c:161 -#: ../tvp-git-helper/tgh-branch-dialog.c:144 -#: ../tvp-git-helper/tgh-stash-dialog.c:167 +#: ../thunar-vcs-plugin/tvp-git-action.c:247 ../tvp-git-helper/main.c:161 +#: ../tvp-git-helper/tgh-branch-dialog.c:140 +#: ../tvp-git-helper/tgh-stash-dialog.c:166 msgid "Branch" msgstr "Gren" -#: ../thunar-vcs-plugin/tvp-git-action.c:269 -#: ../thunar-vcs-plugin/tvp-svn-action.c:322 +#: ../thunar-vcs-plugin/tvp-git-action.c:248 +#: ../thunar-vcs-plugin/tvp-svn-action.c:302 msgid "Menu|Checkout" msgstr "Tjek ud" -#: ../thunar-vcs-plugin/tvp-git-action.c:269 -#: ../thunar-vcs-plugin/tvp-svn-action.c:322 ../tvp-svn-helper/main.c:271 +#: ../thunar-vcs-plugin/tvp-git-action.c:248 +#: ../thunar-vcs-plugin/tvp-svn-action.c:302 ../tvp-svn-helper/main.c:271 #: ../tvp-svn-helper/tsh-checkout.c:100 ../tvp-svn-helper/tsh-checkout.c:112 msgid "Checkout" msgstr "Tjek ud" -#: ../thunar-vcs-plugin/tvp-git-action.c:270 +#: ../thunar-vcs-plugin/tvp-git-action.c:249 msgid "Menu|Clean" msgstr "Ryd" -#: ../thunar-vcs-plugin/tvp-git-action.c:270 ../tvp-git-helper/main.c:165 +#: ../thunar-vcs-plugin/tvp-git-action.c:249 ../tvp-git-helper/main.c:165 #: ../tvp-git-helper/tgh-clean.c:152 ../tvp-git-helper/tgh-clean-dialog.c:96 msgid "Clean" msgstr "Ryd" -#: ../thunar-vcs-plugin/tvp-git-action.c:272 +#: ../thunar-vcs-plugin/tvp-git-action.c:251 msgid "Menu|Clone" msgstr "Klone" -#: ../thunar-vcs-plugin/tvp-git-action.c:272 ../tvp-git-helper/main.c:169 +#: ../thunar-vcs-plugin/tvp-git-action.c:251 ../tvp-git-helper/main.c:169 #: ../tvp-git-helper/tgh-clone.c:115 msgid "Clone" msgstr "Klone" -#: ../thunar-vcs-plugin/tvp-git-action.c:273 -#: ../thunar-vcs-plugin/tvp-svn-action.c:332 +#: ../thunar-vcs-plugin/tvp-git-action.c:252 +#:
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] branch master updated (1860f2c -> c700ee2)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from 1860f2c I18n: Update translation ru (100%). new c700ee2 I18n: Update translation da (99%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/da.po | 718 --- 1 file changed, 415 insertions(+), 303 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 16/20: Properly bzero args (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 01abcbdd73377b8b416272d6714fabda59cad0a7 Author: rim Date: Wed May 30 21:52:05 2018 +0200 Properly bzero args (bug 14401) --- src/task-manager-bsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c index e5c9691..8094332 100644 --- a/src/task-manager-bsd.c +++ b/src/task-manager-bsd.c @@ -118,6 +118,7 @@ gboolean get_task_list (GArray *task_list) for (;; size *= 2) { if ((args = realloc(args, size)) == NULL) errx(1,"failed to allocate memory (size=%zu) for argv structures of pid %d", size, t.pid); + bzero(args, size); mib[0] = CTL_KERN; mib[1] = KERN_PROC_ARGS; mib[2] = t.pid; -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 15/20: use a 1k buffer for the initial argv malloc (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit bbee8970794caddd3e7231cd0b05be1a12eda5d4 Author: rim Date: Wed May 30 21:51:50 2018 +0200 use a 1k buffer for the initial argv malloc (bug 14401) --- src/task-manager-bsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c index ff5236d..e5c9691 100644 --- a/src/task-manager-bsd.c +++ b/src/task-manager-bsd.c @@ -111,7 +111,7 @@ gboolean get_task_list (GArray *task_list) g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1); /* shamelessly stolen from top/machine.c */ if (!P_ZOMBIE()) { - size = 128; + size = 1024; if ((args = malloc(size)) == NULL) errx(1,"failed to allocate memory for argv structures at %zu", size); bzero(args, size); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 17/20: parenthesis around addition (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 3d7f9fd794e48e00a5bf5b9b9b2d76d40d943dc7 Author: rim Date: Wed May 30 21:53:33 2018 +0200 parenthesis around addition (bug 14401) --- src/task-manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/task-manager.c b/src/task-manager.c index 68d408e..64d19bd 100644 --- a/src/task-manager.c +++ b/src/task-manager.c @@ -267,7 +267,7 @@ model_update_tree_iter (XtmTaskManager *manager, GtkTreeIter *iter, glong timest XTM_PTV_COLUMN_VSZ_STR, vsz, XTM_PTV_COLUMN_RSS, task->rss, XTM_PTV_COLUMN_RSS_STR, rss, - XTM_PTV_COLUMN_CPU, task->cpu_user + task->cpu_system, + XTM_PTV_COLUMN_CPU, (task->cpu_user + task->cpu_system), XTM_PTV_COLUMN_CPU_STR, cpu, XTM_PTV_COLUMN_PRIORITY, task->prio, XTM_PTV_COLUMN_BACKGROUND, background, -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 14/20: Select_Window returns a static Window (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit ccb9824ce2acf69c56774f4a3f36085943f4687d Author: rim Date: Wed May 30 21:50:59 2018 +0200 Select_Window returns a static Window (bug 14401) --- src/process-window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/process-window.c b/src/process-window.c index a0b6ad6..32cf8e7 100644 --- a/src/process-window.c +++ b/src/process-window.c @@ -90,7 +90,7 @@ filter_entry_icon_pressed_cb (GtkEntry *entry, } } -Window +static Window Select_Window (Display *dpy, int screen) { int status; -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 18/20: Rework the way model is iterated through (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit f51c2b18f7462d9c258ad6b86cf0e02ee4a45d14 Author: rim Date: Wed May 30 21:56:48 2018 +0200 Rework the way model is iterated through (bug 14401) --- src/task-manager.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/task-manager.c b/src/task-manager.c index 64d19bd..8c4ceaf 100644 --- a/src/task-manager.c +++ b/src/task-manager.c @@ -395,10 +395,10 @@ xtm_task_manager_update_model (XtmTaskManager *manager) Task *task, *task_new; GtkTreeIter cur_iter = iter; - gtk_tree_model_get (manager->model, , XTM_PTV_COLUMN_CPU_STR, _str, XTM_PTV_COLUMN_TIMESTAMP, _timestamp, XTM_PTV_COLUMN_PID, , -1); + valid = gtk_tree_model_iter_next (manager->model, ); + gtk_tree_model_get (manager->model, _iter, XTM_PTV_COLUMN_CPU_STR, _str, XTM_PTV_COLUMN_TIMESTAMP, _timestamp, XTM_PTV_COLUMN_PID, , -1); found = (g_strcmp0 (cpu_str, "-") == 0); g_free (cpu_str); - valid = gtk_tree_model_iter_next (manager->model, ); if (found && (timestamp - old_timestamp) > TIMESTAMP_DELTA) { G_DEBUG_FMT ("Remove old task %d", pid); @@ -446,7 +446,7 @@ xtm_task_manager_update_model (XtmTaskManager *manager) } g_free (color); } - + if (need_update) { model_update_tree_iter (manager, _iter, timestamp, update_cmd_line, task); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 13/20: Fix useless indentation (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 295e635606d7348b22c6969a24a9f6a671dd759e Author: rim Date: Wed May 30 21:50:17 2018 +0200 Fix useless indentation (bug 14401) --- src/process-tree-view.c | 37 - 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/process-tree-view.c b/src/process-tree-view.c index 4975775..cffa79e 100644 --- a/src/process-tree-view.c +++ b/src/process-tree-view.c @@ -517,33 +517,28 @@ popup_menu (XtmProcessTreeView *treeview, GPid pid, guint activate_time, gboolea static gboolean treeview_clicked (XtmProcessTreeView *treeview, GdkEventButton *event) { + GtkTreeModel *model; + GtkTreeSelection *selection; + GtkTreePath *path; + GtkTreeIter iter; + gboolean tree; GPid pid; if (event->button != 3) return FALSE; - { - GtkTreeModel *model; - GtkTreeSelection *selection; - GtkTreePath *path; - GtkTreeIter iter; - gboolean tree; - - g_object_get (treeview->settings, "process-tree", , NULL); - model = GTK_TREE_MODEL (tree ? treeview->model_tree : treeview->model_filter); - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); - gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview), (gint)event->x, (gint)event->y, , NULL, NULL, NULL); - - if (path == NULL) - return FALSE; - - gtk_tree_model_get_iter (model, , path); - gtk_tree_model_get (model, , XTM_PTV_COLUMN_PID, , -1); - gtk_tree_selection_select_path (selection, path); - gtk_tree_path_free (path); + g_object_get (treeview->settings, "process-tree", , NULL); + model = GTK_TREE_MODEL (tree ? treeview->model_tree : treeview->model_filter); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); + gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (treeview), (gint)event->x, (gint)event->y, , NULL, NULL, NULL); + if (path == NULL) + return FALSE; + gtk_tree_model_get_iter (model, , path); + gtk_tree_model_get (model, , XTM_PTV_COLUMN_PID, , -1); + gtk_tree_selection_select_path (selection, path); + gtk_tree_path_free (path); - G_DEBUG_FMT ("Found iter with pid %d", pid); - } + G_DEBUG_FMT ("Found iter with pid %d", pid); popup_menu (treeview, pid, event->time, TRUE); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 20/20: Simplify the way process state is stored on FreeBSD (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 84e719796ec6223dd31107283918c08d22b268cf Author: rim Date: Wed May 30 21:59:02 2018 +0200 Simplify the way process state is stored on FreeBSD (bug 14401) --- src/task-manager-freebsd.c | 51 +++--- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/src/task-manager-freebsd.c b/src/task-manager-freebsd.c index 0cce230..c4d985f 100644 --- a/src/task-manager-freebsd.c +++ b/src/task-manager-freebsd.c @@ -27,7 +27,19 @@ #include "task-manager.h" -guint64 +static const gchar ki_stat2state[] = { + ' ', /* - */ + 'R', /* SIDL */ + 'R', /* SRUN */ + 'S', /* SSLEEP */ + 'T', /* SSTOP */ + 'Z', /* SZOMB */ + 'W', /* SWAIT */ + 'L' /* SLOCK */ +}; + + +static guint64 get_mem_by_bytes (const gchar *name) { guint64 buf = 0; @@ -170,36 +182,24 @@ get_task_details (struct kinfo_proc *kp, Task *task) i = 0; switch (kp->ki_stat) { - case SSTOP: - task->state[i] = 'T'; - break; - - case SSLEEP: - if (kp->ki_tdflags & TDF_SINTR) - task->state[i] = kp->ki_slptime >= MAXSLP ? 'I' : 'S'; - else - task->state[i] = 'D'; - break; - - case SRUN: case SIDL: - task->state[i] = 'R'; - break; - + case SRUN: + case SSTOP: + case SZOMB: case SWAIT: - task->state[i] = 'W'; - break; - case SLOCK: - task->state[i] = 'L'; - break; + task->state[i] = ki_stat2state[(size_t)kp->ki_stat]; + break; - case SZOMB: - task->state[i] = 'Z'; - break; + case SSLEEP: + if (kp->ki_tdflags & TDF_SINTR) + task->state[i] = kp->ki_slptime >= MAXSLP ? 'I' : 'S'; + else + task->state[i] = 'D'; + break; default: - task->state[i] = '?'; + task->state[i] = '?'; } i++; if (!(kp->ki_sflag & PS_INMEM)) @@ -222,7 +222,6 @@ get_task_details (struct kinfo_proc *kp, Task *task) task->state[i++] = '+'; if (kp->ki_flag & P_JAILED) task->state[i++] = 'J'; - task->state[i] = '\0'; return TRUE; } -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 19/20: More cast/type fixes (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 6cfb7547b0de3cdeffd618b0d804d0a77af3d0aa Author: rim Date: Wed May 30 21:58:08 2018 +0200 More cast/type fixes (bug 14401) --- src/task-manager-freebsd.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/task-manager-freebsd.c b/src/task-manager-freebsd.c index ac49064..0cce230 100644 --- a/src/task-manager-freebsd.c +++ b/src/task-manager-freebsd.c @@ -39,14 +39,14 @@ get_mem_by_bytes (const gchar *name) return buf; } -guint64 +static guint64 get_mem_by_pages (const gchar *name) { guint64 res; res = get_mem_by_bytes (name); if (res > 0) - res *= getpagesize (); + res *= (guint64)getpagesize (); return res; } @@ -71,8 +71,8 @@ get_memory_usage (guint64 *memory_total, guint64 *memory_free, guint64 *memory_c return FALSE; kvm_getswapinfo (kd, , 1, 0); - *swap_total = ((guint64)kswap.ksw_total) * getpagesize (); - *swap_free = ((guint64)(kswap.ksw_total - kswap.ksw_used)) * getpagesize (); + *swap_total = (guint64)kswap.ksw_total * (guint64)getpagesize (); + *swap_free = ((guint64)(kswap.ksw_total - kswap.ksw_used)) * (guint64)getpagesize (); kvm_close (kd); } @@ -129,9 +129,9 @@ get_task_details (struct kinfo_proc *kp, Task *task) task->cpu_user = 100.0f * ((float)kp->ki_pctcpu / FSCALE); task->cpu_system = 0.0f; task->vsz = kp->ki_size; - task->rss = kp->ki_rssize * getpagesize (); + task->rss = ((guint64)kp->ki_rssize * (guint64)getpagesize ()); task->uid = kp->ki_uid; - task->prio = (gushort)kp->ki_nice; + task->prio = (gshort)kp->ki_nice; g_strlcpy (task->name, kp->ki_comm, sizeof(task->name)); oid[0] = CTL_KERN; -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 10/20: xtm_process_tree_model_get_value returns void (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit e8b4fa49bbb0bba59d5261face8deb63772ff81b Author: rim Date: Wed May 30 21:47:59 2018 +0200 xtm_process_tree_model_get_value returns void (bug 14401) --- src/process-tree-model.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/process-tree-model.c b/src/process-tree-model.c index deb2ed3..4334c25 100644 --- a/src/process-tree-model.c +++ b/src/process-tree-model.c @@ -260,7 +260,7 @@ xtm_process_tree_model_get_value (GtkTreeModel *model, GtkTreeIter *iter, gint c /* Use path for non-persistent models */ if (lnk->path) gtk_tree_model_get_iter (model, iter, lnk->path); - return gtk_tree_model_get_value (model, iter, column, value); + gtk_tree_model_get_value (model, iter, column, value); } static gboolean -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 11/20: spacing
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit ce69b96ce4d1e08d845eb5ded84a0ef35cdb8372 Author: rim Date: Wed May 30 21:48:37 2018 +0200 spacing --- src/process-tree-model.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/process-tree-model.c b/src/process-tree-model.c index 4334c25..9602658 100644 --- a/src/process-tree-model.c +++ b/src/process-tree-model.c @@ -231,7 +231,9 @@ xtm_process_tree_model_get_path (GtkTreeModel *model, GtkTreeIter *iter) GtkTreePath *path; GNode *child, *parent; XtmProcessTreeModel *treemodel = XTM_PROCESS_TREE_MODEL (model); + g_return_val_if_fail (iter->stamp == treemodel->stamp, NULL); + child = iter->user_data; parent = child->parent; path = gtk_tree_path_new (); @@ -268,7 +270,9 @@ xtm_process_tree_model_iter_next (GtkTreeModel *model, GtkTreeIter *iter) { GNode *node; XtmProcessTreeModel *treemodel = XTM_PROCESS_TREE_MODEL (model); + g_return_val_if_fail (iter->stamp == treemodel->stamp, FALSE); + node = iter->user_data; iter->user_data = g_node_next_sibling (node); /* Make iter invalid if no node has been found */ @@ -298,7 +302,9 @@ xtm_process_tree_model_iter_has_child (GtkTreeModel *model, GtkTreeIter *iter) { GNode *node; XtmProcessTreeModel *treemodel = XTM_PROCESS_TREE_MODEL (model); + g_return_val_if_fail (iter->stamp == treemodel->stamp, FALSE); + node = iter->user_data; return g_node_first_child (node) != NULL; } -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 09/20: More float initializers (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 9ed5f79f8dbe95a531c1515af7c470c497663c10 Author: rim Date: Wed May 30 21:47:24 2018 +0200 More float initializers (bug 14401) --- src/process-window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/process-window.c b/src/process-window.c index 3f455a5..a0b6ad6 100644 --- a/src/process-window.c +++ b/src/process-window.c @@ -270,14 +270,14 @@ xtm_process_window_init (XtmProcessWindow *window) toolitem = GTK_WIDGET (gtk_builder_get_object (window->builder, "graph-cpu")); window->cpu_monitor = xtm_process_monitor_new (); - xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->cpu_monitor), refresh_rate / 1000.0); + xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->cpu_monitor), refresh_rate / 1000.0f); xtm_process_monitor_set_type (XTM_PROCESS_MONITOR (window->cpu_monitor), 0); gtk_widget_show (window->cpu_monitor); gtk_container_add (GTK_CONTAINER (toolitem), window->cpu_monitor); toolitem = GTK_WIDGET (gtk_builder_get_object (window->builder, "graph-mem")); window->mem_monitor = xtm_process_monitor_new (); - xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->mem_monitor), refresh_rate / 1000.0); + xtm_process_monitor_set_step_size (XTM_PROCESS_MONITOR (window->mem_monitor), refresh_rate / 1000.0f); xtm_process_monitor_set_type (XTM_PROCESS_MONITOR (window->mem_monitor), 1); gtk_widget_show (window->mem_monitor); gtk_container_add (GTK_CONTAINER (toolitem), window->mem_monitor); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 12/20: Better zeroing of found struct (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 7de82ec291fe810b88e5cebb877b973e74481c78 Author: rim Date: Wed May 30 21:49:22 2018 +0200 Better zeroing of found struct (bug 14401) --- src/process-tree-model.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/process-tree-model.c b/src/process-tree-model.c index 9602658..551a722 100644 --- a/src/process-tree-model.c +++ b/src/process-tree-model.c @@ -445,7 +445,7 @@ xtm_process_tree_model_row_changed (XtmProcessTreeModel *treemodel, GtkTreePath GtkTreeIter s_iter; XtmCrossLink *lnk, *c_link; GNode *node, *next_node, *old_parent; - struct find_node_struct found = {{0}}; + struct find_node_struct found; GValue c_value = {0}; GValue p_value = {0}; gboolean same = TRUE; @@ -464,6 +464,7 @@ xtm_process_tree_model_row_changed (XtmProcessTreeModel *treemodel, GtkTreePath s_iter.user_data3 = NULL; /* Use the root entry as fall-back if no parent could be found */ + bzero(, sizeof(found)); found.parent = treemodel->tree; found.treemodel = treemodel; gtk_tree_model_get_value (model, iter, treemodel->p_column, _value); @@ -608,7 +609,7 @@ xtm_process_tree_model_row_inserted (XtmProcessTreeModel *treemodel, GtkTreePath GtkTreeIter s_iter; XtmCrossLink *lnk, *c_link; GNode *node, *next_node; - struct find_node_struct found = {{0}}; + struct find_node_struct found; GValue c_value = {0}; GValue p_value = {0}; gboolean same; @@ -641,6 +642,7 @@ xtm_process_tree_model_row_inserted (XtmProcessTreeModel *treemodel, GtkTreePath g_sequence_foreach_range (g_sequence_iter_next (lnk->list), g_sequence_get_end_iter (treemodel->list), do_path, (gpointer)gtk_tree_path_next); + bzero(, sizeof(found)); found.parent = treemodel->tree; found.treemodel = treemodel; gtk_tree_model_get_value (model, iter, treemodel->p_column, _value); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 08/20: Use the proper types, add casts where necessary (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 1c09b7329b9df1a7a675f4a03b5261bd4edf8698 Author: rim Date: Wed May 30 21:46:29 2018 +0200 Use the proper types, add casts where necessary (bug 14401) --- src/process-monitor.c| 12 ++-- src/process-tree-model.c | 18 +- src/process-tree-view.c | 19 ++- src/settings-dialog.c| 6 +++--- src/settings.c | 4 ++-- src/task-manager-bsd.c | 2 +- src/task-manager.c | 4 ++-- 7 files changed, 33 insertions(+), 32 deletions(-) diff --git a/src/process-monitor.c b/src/process-monitor.c index 1dc0eb3..3e1bd01 100644 --- a/src/process-monitor.c +++ b/src/process-monitor.c @@ -121,7 +121,7 @@ xtm_process_monitor_draw (GtkWidget *widget, cairo_t *cr) XtmProcessMonitor *monitor = XTM_PROCESS_MONITOR (widget); guint minimum_history_length; - minimum_history_length = gtk_widget_get_allocated_width(widget) / monitor->step_size; + minimum_history_length = (guint)(gtk_widget_get_allocated_width(widget) / monitor->step_size); if (monitor->history->len < minimum_history_length) g_array_set_size (monitor->history, minimum_history_length + 1); @@ -136,7 +136,7 @@ xtm_process_monitor_expose (GtkWidget *widget, GdkEventExpose *event __unused) guint minimum_history_length; cairo_t *cr; - minimum_history_length = widget->allocation.width / monitor->step_size; + minimum_history_length = (guint)(widget->allocation.width / monitor->step_size); if (monitor->history->len < minimum_history_length) g_array_set_size (monitor->history, minimum_history_length + 1); @@ -153,7 +153,7 @@ xtm_process_monitor_graph_surface_create (XtmProcessMonitor *monitor, gint width cairo_t *cr; cairo_surface_t *graph_surface; gfloat *peak; - gfloat step_size; + gdouble step_size; gint i; if (monitor->history->len <= 1) @@ -161,7 +161,7 @@ xtm_process_monitor_graph_surface_create (XtmProcessMonitor *monitor, gint width g_warning ("Cannot paint graph with n_peak <= 1"); return NULL; } - step_size = monitor->step_size; + step_size = (gdouble)monitor->step_size; graph_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); cr = cairo_create (graph_surface); @@ -180,7 +180,7 @@ xtm_process_monitor_graph_surface_create (XtmProcessMonitor *monitor, gint width { peak = _array_index (monitor->history, gfloat, i); cairo_translate (cr, -step_size, 0); - cairo_line_to (cr, width, (1.0 - *peak) * height); + cairo_line_to (cr, width, (1.0 - ((gdouble)(*peak))) * height); } cairo_line_to (cr, width, height); cairo_fill (cr); @@ -201,7 +201,7 @@ xtm_process_monitor_graph_surface_create (XtmProcessMonitor *monitor, gint width { peak = _array_index (monitor->history, gfloat, i); cairo_translate (cr, -step_size, 0); - cairo_line_to (cr, width, (1.0 - *peak) * height); + cairo_line_to (cr, width, (1.0 - ((gdouble)(*peak))) * height); } cairo_stroke (cr); diff --git a/src/process-tree-model.c b/src/process-tree-model.c index 325b945..deb2ed3 100644 --- a/src/process-tree-model.c +++ b/src/process-tree-model.c @@ -137,7 +137,7 @@ xtm_process_tree_model_init (XtmProcessTreeModel *treemodel) treemodel->c_column = XTM_PTV_COLUMN_PID; treemodel->p_column = XTM_PTV_COLUMN_PPID; - treemodel->stamp = g_random_int (); + treemodel->stamp = (gint)g_random_int (); if (treemodel->stamp == 0) treemodel->stamp = 1; } @@ -215,7 +215,7 @@ xtm_process_tree_model_get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTree /* Walk the tree to create the iter */ for (i = 0; i < depth; i++) { - node = g_node_nth_child (node, indices[i]); + node = g_node_nth_child (node, (guint)indices[i]); if (node == NULL) break; } @@ -313,7 +313,7 @@ xtm_process_tree_model_iter_n_children (GtkTreeModel *model, GtkTreeIter *iter) node = treemodel->tree; else node = iter->user_data; - return g_node_n_children (node); + return (gint)g_node_n_children (node); } static gboolean @@ -326,7 +326,7 @@ xtm_process_tree_model_iter_nth_child (GtkTreeModel *model, GtkTreeIter *iter, G node = treemodel->tree; else node = parent->user_data; - iter->user_data = g_node_nth_child (node, n); +
[Xfce4-commits] [apps/xfce4-taskmanager] 07/20: timeout is an unsigned integer (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 512e88ad6ca039d001f622e6f5e8f6428e0d30c9 Author: rim Date: Wed May 30 21:43:08 2018 +0200 timeout is an unsigned integer (bug 14401) --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 4b29bbd..464bf4d 100644 --- a/src/main.c +++ b/src/main.c @@ -26,7 +26,7 @@ static XtmSettings *settings; static GtkWidget *window; static GtkStatusIcon *status_icon; static XtmTaskManager *task_manager; -static gboolean timeout = FALSE; +static guint timeout = 0; static gboolean start_hidden = FALSE; static GOptionEntry main_entries[] = { -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 05/20: Stop displaying 'Running as on ' and remove corresponding code (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 0111851b4d6cdc87699a932b208ebf783491dbde Author: rim Date: Tue May 29 03:30:31 2018 +0300 Stop displaying 'Running as on ' and remove corresponding code (bug 14401) --- src/main.c | 1 - src/process-tree-view.c | 10 +++--- src/task-manager.c | 50 - src/task-manager.h | 4 4 files changed, 3 insertions(+), 62 deletions(-) diff --git a/src/main.c b/src/main.c index 945cb3a..186edc7 100644 --- a/src/main.c +++ b/src/main.c @@ -237,7 +237,6 @@ int main (int argc, char *argv[]) #endif task_manager = xtm_task_manager_new (xtm_process_window_get_model (XTM_PROCESS_WINDOW (window))); - g_message ("Running as %s on %s", xtm_task_manager_get_username (task_manager), xtm_task_manager_get_hostname (task_manager)); init_timeout (); g_signal_connect (settings, "notify::refresh-rate", G_CALLBACK (refresh_rate_changed), NULL); diff --git a/src/process-tree-view.c b/src/process-tree-view.c index 5c0c3a7..53f278e 100644 --- a/src/process-tree-view.c +++ b/src/process-tree-view.c @@ -11,6 +11,7 @@ #include #endif +#include #include #include #include @@ -90,14 +91,9 @@ xtm_process_tree_view_init (XtmProcessTreeView *treeview) gboolean tree; treeview->settings = xtm_settings_get_default (); + treeview->owner_uid = getuid (); g_signal_connect (treeview->settings, "notify", G_CALLBACK (settings_changed), treeview); - - { - gchar *uid_name; - get_owner_uid (>owner_uid, _name); - g_free (uid_name); - g_object_get (treeview->settings, "show-all-processes", >show_all_processes_cached, "process-tree", , NULL); - } + g_object_get (treeview->settings, "show-all-processes", >show_all_processes_cached, "process-tree", , NULL); /* Create tree view model */ #ifdef HAVE_WNCK diff --git a/src/task-manager.c b/src/task-manager.c index 243f0c1..0624aa1 100644 --- a/src/task-manager.c +++ b/src/task-manager.c @@ -55,9 +55,6 @@ struct _XtmTaskManager #endif GtkTreeModel * model; GArray *tasks; - guint owner_uid; - gchar * owner_uid_name; - gchar * hostname; gushort cpu_count; gfloat cpu_user; gfloat cpu_system; @@ -97,8 +94,6 @@ xtm_task_manager_init (XtmTaskManager *manager) manager->app_manager = xtm_app_manager_new (); #endif manager->tasks = g_array_new (FALSE, FALSE, sizeof (Task)); - get_owner_uid (&(manager->owner_uid), &(manager->owner_uid_name)); - manager->hostname = get_hostname (); /* Listen to settings changes and force an update on the whole model */ settings = xtm_settings_get_default (); @@ -113,8 +108,6 @@ xtm_task_manager_finalize (GObject *object) { XtmTaskManager *manager = XTM_TASK_MANAGER (object); g_array_free (manager->tasks, TRUE); - g_free (manager->owner_uid_name); - g_free (manager->hostname); #ifdef HAVE_WNCK g_object_unref (manager->app_manager); #endif @@ -332,20 +325,6 @@ xtm_task_manager_new (GtkTreeModel *model) return manager; } -const gchar * -xtm_task_manager_get_username (XtmTaskManager *manager) -{ - g_return_val_if_fail (XTM_IS_TASK_MANAGER (manager), NULL); - return manager->owner_uid_name; -} - -const gchar * -xtm_task_manager_get_hostname (XtmTaskManager *manager) -{ - g_return_val_if_fail (XTM_IS_TASK_MANAGER (manager), NULL); - return manager->hostname; -} - void xtm_task_manager_get_system_info (XtmTaskManager *manager, guint *num_processes, gfloat *cpu, guint64 *memory_used, guint64 *memory_total, @@ -495,35 +474,6 @@ xtm_task_manager_update_model (XtmTaskManager *manager) } - -void -get_owner_uid (guint *owner_uid, gchar **owner_uid_name) -{ - uid_t uid; - struct passwd *pw; - gchar *username = NULL; - - uid = getuid (); - pw = getpwuid (uid); - - username = g_strdup ((pw != NULL) ? pw->pw_name : "nobody"); - - *owner_uid = (guint) uid; - *owner_uid_name = username; -} - -gchar * -get_hostname (void) -{ -#ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 255 -#endif - char hostname[HOST_NAME_MAX]; - if (gethostname (hostname, sizeof(hostname))) - return g_strdup ("(unknown)"); - return g_strdup_printf ("%s", hostname); -} - gchar * get_uid_name (guint uid) { diff --git a/src/task-manager.h b/src/task-manager.h index f62f9eb..bc76f9e 100644 ---
[Xfce4-commits] [apps/xfce4-taskmanager] 06/20: Improve GOptionEntry initialization (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit a5f4aaa667ad34058219945c195b502de2688cf1 Author: rim Date: Wed May 30 21:42:04 2018 +0200 Improve GOptionEntry initialization (bug 14401) --- src/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.c b/src/main.c index 186edc7..4b29bbd 100644 --- a/src/main.c +++ b/src/main.c @@ -30,8 +30,8 @@ static gboolean timeout = FALSE; static gboolean start_hidden = FALSE; static GOptionEntry main_entries[] = { - { "start-hidden", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, _hidden, "Don't open a task manager window" }, - { NULL } + { "start-hidden", 0, G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, _hidden, "Don't open a task manager window", NULL }, + { NULL, 0, 0, 0, NULL, NULL, NULL } }; static void -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 04/20: Move getpwuid() from backends to gui, use getpwuid_r(), call only once on task add. (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 8e1b48f8def94d7b1b72464aaf495d761d46176a Author: rim Date: Tue May 29 03:11:15 2018 +0300 Move getpwuid() from backends to gui, use getpwuid_r(), call only once on task add. (bug 14401) --- src/task-manager-bsd.c | 7 --- src/task-manager-freebsd.c | 4 src/task-manager-linux.c | 5 - src/task-manager-skel.c| 1 - src/task-manager-solaris.c | 4 src/task-manager.c | 19 --- src/task-manager.h | 2 +- 7 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c index 0107d20..e921c64 100644 --- a/src/task-manager-bsd.c +++ b/src/task-manager-bsd.c @@ -18,9 +18,7 @@ #include #include -/* for getpwuid() */ #include -#include /* for sysctl() */ #include #include @@ -54,7 +52,6 @@ gboolean get_task_list (GArray *task_list) struct kinfo_proc2 *kp; #endif Task t; - struct passwd *passwdp; char **args; gchar* buf; int nproc, i; @@ -143,10 +140,6 @@ gboolean get_task_list (GArray *task_list) t.cpu_user = (100.0 * ((double) p.p_pctcpu / FSCALE)); t.cpu_system = 0.0f; /* TODO ? */ - /* get username from uid */ - passwdp = getpwuid(t.uid); - if(passwdp != NULL && passwdp->pw_name != NULL) - g_strlcpy(t.uid_name, passwdp->pw_name, sizeof t.uid_name); g_array_append_val(task_list, t); } free(kp); diff --git a/src/task-manager-freebsd.c b/src/task-manager-freebsd.c index 0438b97..ac49064 100644 --- a/src/task-manager-freebsd.c +++ b/src/task-manager-freebsd.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -120,7 +119,6 @@ get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat *cpu_system) static gboolean get_task_details (struct kinfo_proc *kp, Task *task) { - struct passwd *pw; char buf[1024], *p; size_t bufsz; int i, oid[4]; @@ -132,9 +130,7 @@ get_task_details (struct kinfo_proc *kp, Task *task) task->cpu_system = 0.0f; task->vsz = kp->ki_size; task->rss = kp->ki_rssize * getpagesize (); - pw = getpwuid (kp->ki_uid); task->uid = kp->ki_uid; - g_strlcpy (task->uid_name, (pw != NULL) ? pw->pw_name : "nobody", sizeof (task->uid_name)); task->prio = (gushort)kp->ki_nice; g_strlcpy (task->name, kp->ki_comm, sizeof(task->name)); diff --git a/src/task-manager-linux.c b/src/task-manager-linux.c index a62c5a0..441a234 100644 --- a/src/task-manager-linux.c +++ b/src/task-manager-linux.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -294,7 +293,6 @@ get_task_details (GPid pid, Task *task) /* Parse the status file: it contains the UIDs */ { - struct passwd *pw; guint dummy; snprintf(filename, sizeof (filename), "/proc/%d/status", pid); @@ -307,9 +305,6 @@ get_task_details (GPid pid, Task *task) break; } fclose (file); - - pw = getpwuid (task->uid); - g_strlcpy (task->uid_name, (pw != NULL) ? pw->pw_name : "nobody", sizeof (task->uid_name)); } /* Read the full command line */ diff --git a/src/task-manager-skel.c b/src/task-manager-skel.c index f2f82a1..cfca284 100644 --- a/src/task-manager-skel.c +++ b/src/task-manager-skel.c @@ -11,7 +11,6 @@ /* Add includes for system functions needed */ /* Example: #include -#include #include #include */ diff --git a/src/task-manager-solaris.c b/src/task-manager-solaris.c index cc9defc..37279b0 100644 --- a/src/task-manager-solaris.c +++ b/src/task-manager-solaris.c @@ -9,7 +9,6 @@ */ #include -#include #include #include #include @@ -173,7 +172,6 @@ get_task_details (GPid pid, Task *task) { FILE *file; gchar filename[96]; - struct passwd *pw; psinfo_t process; snprintf (filename, sizeof(filename), "/proc/%d/psinfo", pid); @@ -195,9 +193,7 @@ get_task_details (GPid pid, Task *task) task->vsz = (guint64)process.pr_size * 1024; task->rss = (guint64)process.pr_rssize * 1024; task->prio = (gushort)process.pr_lwp.pr_pri; - pw = getpwuid (process.pr_uid); task->uid = (guint)process.pr_uid; - g_strlcpy (task->uid_name, (pw != NULL) ? pw->pw_name : "nobody", sizeof (task->uid_name)); get_cpu_percent (task->pid, (process.pr_time.tv_sec * 1000 + process.pr_time.tv_nsec / 10), >cpu_user, 0, >cpu_system); fclose (file); diff
[Xfce4-commits] [apps/xfce4-taskmanager] 01/20: Make pid type: GPid (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit ceb5a7d347b14ed71bf66e60fcb751b8ab868dc6 Author: rim Date: Mon May 28 23:12:18 2018 +0300 Make pid type: GPid (bug 14401) --- src/app-manager.c | 18 +- src/app-manager.h | 4 ++-- src/process-tree-view.c| 36 ++-- src/process-tree-view.h| 2 +- src/process-window.c | 8 +++- src/task-manager-bsd.c | 2 +- src/task-manager-freebsd.c | 2 +- src/task-manager-linux.c | 18 +- src/task-manager-skel.c| 6 +++--- src/task-manager-solaris.c | 22 +++--- src/task-manager.c | 10 +- src/task-manager.h | 10 +- 12 files changed, 68 insertions(+), 70 deletions(-) diff --git a/src/app-manager.c b/src/app-manager.c index 7066e6f..18c1203 100644 --- a/src/app-manager.c +++ b/src/app-manager.c @@ -38,12 +38,12 @@ G_DEFINE_TYPE (XtmAppManager, xtm_app_manager, G_TYPE_OBJECT) static voidxtm_app_manager_finalize(GObject *object); -static gintapp_get_pid (WnckApplication *application); +static GPidapp_get_pid (WnckApplication *application); static gintapp_pid_compare_fn (gconstpointer a, gconstpointer b); -static voidapps_add_application(GArray *apps, WnckApplication *application, gint pid); +static voidapps_add_application(GArray *apps, WnckApplication *application, GPid pid); static voidapps_remove_application (GArray *apps, WnckApplication *application); -static App * apps_lookup_pid (GArray *apps, gint pid); +static App * apps_lookup_pid (GArray *apps, GPid pid); static voidapplication_opened (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager); static voidapplication_closed (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager); @@ -93,10 +93,10 @@ xtm_app_manager_finalize (GObject *object) g_array_free (XTM_APP_MANAGER (object)->apps, TRUE); } -static gint +static GPid app_get_pid(WnckApplication *application) { - gint pid; + GPid pid; if (NULL == application) return (0); pid = wnck_application_get_pid (application); @@ -112,7 +112,7 @@ app_pid_compare_fn(gconstpointer a, gconstpointer b) } static void -apps_add_application (GArray *apps, WnckApplication *application, gint pid) +apps_add_application (GArray *apps, WnckApplication *application, GPid pid) { App app; @@ -141,7 +141,7 @@ apps_remove_application (GArray *apps, WnckApplication *application) } static App * -apps_lookup_pid (GArray *apps, gint pid) +apps_lookup_pid (GArray *apps, GPid pid) { App tapp; @@ -153,7 +153,7 @@ apps_lookup_pid (GArray *apps, gint pid) static void application_opened (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager) { - gint pid = app_get_pid (application); + GPid pid = app_get_pid (application); G_DEBUG_FMT ("Application opened %p %d", (void*)application, pid); apps_add_application (manager->apps, application, pid); } @@ -174,7 +174,7 @@ xtm_app_manager_new (void) } App * -xtm_app_manager_get_app_from_pid (XtmAppManager *manager, gint pid) +xtm_app_manager_get_app_from_pid (XtmAppManager *manager, GPid pid) { return apps_lookup_pid (manager->apps, pid); } diff --git a/src/app-manager.h b/src/app-manager.h index 446df62..877134e 100644 --- a/src/app-manager.h +++ b/src/app-manager.h @@ -23,7 +23,7 @@ typedef struct _App App; struct _App { WnckApplication * application; - gintpid; + GPidpid; gchar name[1024]; GdkPixbuf * icon; }; @@ -39,6 +39,6 @@ typedef struct _XtmAppManager XtmAppManager; GType xtm_app_manager_get_type(void); XtmAppManager *xtm_app_manager_new (void); -App * xtm_app_manager_get_app_from_pid (XtmAppManager *manager, gint pid); +App * xtm_app_manager_get_app_from_pid (XtmAppManager *manager, GPid pid); #endif /* !APP_MANAGER_H */ diff --git a/src/process-tree-view.c b/src/process-tree-view.c index ca4920f..6458b37 100644 --- a/src/process-tree-view.c +++ b/src/process-tree-view.c @@ -356,7 +356,7 @@ cb_send_signal
[Xfce4-commits] [apps/xfce4-taskmanager] 03/20: Fix possible file descriptor leak on linux (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 40a3e65803a87770138d49acf79da33398497f6a Author: rim Date: Tue May 29 02:47:00 2018 +0300 Fix possible file descriptor leak on linux (bug 14401) --- src/task-manager-linux.c | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/task-manager-linux.c b/src/task-manager-linux.c index 71d5ca0..a62c5a0 100644 --- a/src/task-manager-linux.c +++ b/src/task-manager-linux.c @@ -71,8 +71,13 @@ get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat *cpu_system) static gulong jiffies_user_old = 0, jiffies_system_old = 0, jiffies_total_old = 0; gulong user = 0, user_nice = 0, system = 0, idle = 0; - if ((file = fopen (filename, "r")) == NULL || fgets (buffer, sizeof(buffer), file) == NULL) + if ((file = fopen (filename, "r")) == NULL) return FALSE; + if (fgets (buffer, sizeof(buffer), file) == NULL) + { + fclose (file); + return FALSE; + } sscanf (buffer, "cpu\t%lu %lu %lu %lu", , _nice, , ); @@ -195,8 +200,13 @@ get_task_details (GPid pid, Task *task) gchar buffer[1024]; snprintf (filename, sizeof(filename), "/proc/%d/stat", pid); - if ((file = fopen (filename, "r")) == NULL || fgets (buffer, sizeof(buffer), file) == NULL) + if ((file = fopen (filename, "r")) == NULL) return FALSE; + if (fgets (buffer, sizeof(buffer), file) == NULL) + { + fclose (file); + return FALSE; + } fclose (file); bzero(task, sizeof(Task)); -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [apps/xfce4-taskmanager] 02/20: Mark unused params, remove unused macro and args (bug 14401)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. commit 66a0d4bfc9e13de705b97bbe395b7b7d42a38276 Author: rim Date: Tue May 29 02:23:26 2018 +0300 Mark unused params, remove unused macro and args (bug 14401) --- src/app-manager.c | 4 ++-- src/process-monitor.c | 2 +- src/process-tree-model.c | 8 src/process-tree-view.c| 6 +++--- src/process-window.c | 8 src/settings.c | 1 - src/task-manager-freebsd.c | 4 ++-- src/task-manager.c | 2 +- src/task-manager.h | 4 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/app-manager.c b/src/app-manager.c index 18c1203..5092e00 100644 --- a/src/app-manager.c +++ b/src/app-manager.c @@ -151,7 +151,7 @@ apps_lookup_pid (GArray *apps, GPid pid) } static void -application_opened (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager) +application_opened (WnckScreen *screen __unused, WnckApplication *application, XtmAppManager *manager) { GPid pid = app_get_pid (application); G_DEBUG_FMT ("Application opened %p %d", (void*)application, pid); @@ -159,7 +159,7 @@ application_opened (WnckScreen *screen, WnckApplication *application, XtmAppMana } static void -application_closed (WnckScreen *screen, WnckApplication *application, XtmAppManager *manager) +application_closed (WnckScreen *screen __unused, WnckApplication *application, XtmAppManager *manager) { G_DEBUG_FMT ("Application closed %p", (void*)application); apps_remove_application (manager->apps, application); diff --git a/src/process-monitor.c b/src/process-monitor.c index 4d48223..1dc0eb3 100644 --- a/src/process-monitor.c +++ b/src/process-monitor.c @@ -130,7 +130,7 @@ xtm_process_monitor_draw (GtkWidget *widget, cairo_t *cr) } #else static gboolean -xtm_process_monitor_expose (GtkWidget *widget, GdkEventExpose *event) +xtm_process_monitor_expose (GtkWidget *widget, GdkEventExpose *event __unused) { XtmProcessMonitor *monitor = XTM_PROCESS_MONITOR (widget); guint minimum_history_length; diff --git a/src/process-tree-model.c b/src/process-tree-model.c index 2e139f8..325b945 100644 --- a/src/process-tree-model.c +++ b/src/process-tree-model.c @@ -154,7 +154,7 @@ xtm_process_tree_model_finalize (GObject *object) } static void -xtm_process_tree_model_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +xtm_process_tree_model_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec __unused) { XtmProcessTreeModel *treemodel = XTM_PROCESS_TREE_MODEL (object); switch (property_id) @@ -166,7 +166,7 @@ xtm_process_tree_model_set_property (GObject *object, guint property_id, const G } static void -xtm_process_tree_model_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +xtm_process_tree_model_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec __unused) { XtmProcessTreeModel *treemodel = XTM_PROCESS_TREE_MODEL (object); switch (property_id) @@ -178,7 +178,7 @@ xtm_process_tree_model_get_property (GObject *object, guint property_id, GValue } static GtkTreeModelFlags -xtm_process_tree_model_get_flags (GtkTreeModel *model) +xtm_process_tree_model_get_flags (GtkTreeModel *model __unused) { return GTK_TREE_MODEL_ITERS_PERSIST; } @@ -857,7 +857,7 @@ reorder_children (GNode *parent, gpointer data) } static void -xtm_process_tree_model_rows_reordered (XtmProcessTreeModel *treemodel, GtkTreePath *path, GtkTreeIter *iter, gint *new_order, GtkTreeModel *model) +xtm_process_tree_model_rows_reordered (XtmProcessTreeModel *treemodel, GtkTreePath *path __unused, GtkTreeIter *iter __unused, gint *new_order, GtkTreeModel *model) { gint i, size; GSequence *s_list; diff --git a/src/process-tree-view.c b/src/process-tree-view.c index 6458b37..5c0c3a7 100644 --- a/src/process-tree-view.c +++ b/src/process-tree-view.c @@ -493,7 +493,7 @@ build_context_menu (XtmProcessTreeView *treeview, GPid pid) } static void -position_menu (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, XtmProcessTreeView *treeview) +position_menu (GtkMenu *menu __unused, gint *x, gint *y, gboolean *push_in, XtmProcessTreeView *treeview) { gdk_window_get_origin (gtk_tree_view_get_bin_window (GTK_TREE_VIEW (treeview)), x, y); *x += 5; @@ -664,7 +664,7 @@ visible_func (GtkTreeModel *model, GtkTreeIter *iter, XtmProcessTreeView *treevi } static gboolean -search_func (GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer user_data) +search_func (GtkTreeModel *model, gint column __unused, const gchar
[Xfce4-commits] [apps/xfce4-taskmanager] branch master updated (397bb63 -> 84e7197)
This is an automated email from the git hooks/post-receive script. l a n d r y p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/xfce4-taskmanager. from 397bb63 Improvements to --start-hidden (bug 14343) new ceb5a7d Make pid type: GPid (bug 14401) new 66a0d4b Mark unused params, remove unused macro and args (bug 14401) new 40a3e65 Fix possible file descriptor leak on linux (bug 14401) new 8e1b48f Move getpwuid() from backends to gui, use getpwuid_r(), call only once on task add. (bug 14401) new 0111851 Stop displaying 'Running as on ' and remove corresponding code (bug 14401) new a5f4aaa Improve GOptionEntry initialization (bug 14401) new 512e88a timeout is an unsigned integer (bug 14401) new 1c09b73 Use the proper types, add casts where necessary (bug 14401) new 9ed5f79 More float initializers (bug 14401) new e8b4fa4 xtm_process_tree_model_get_value returns void (bug 14401) new ce69b96 spacing new 7de82ec Better zeroing of found struct (bug 14401) new 295e635 Fix useless indentation (bug 14401) new ccb9824 Select_Window returns a static Window (bug 14401) new bbee897 use a 1k buffer for the initial argv malloc (bug 14401) new 01abcbd Properly bzero args (bug 14401) new 3d7f9fd parenthesis around addition (bug 14401) new f51c2b1 Rework the way model is iterated through (bug 14401) new 6cfb754 More cast/type fixes (bug 14401) new 84e7197 Simplify the way process state is stored on FreeBSD (bug 14401) The 20 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: src/app-manager.c | 22 - src/app-manager.h | 4 +- src/main.c | 7 ++- src/process-monitor.c | 14 +++--- src/process-tree-model.c | 40 ++--- src/process-tree-view.c| 108 + src/process-tree-view.h| 2 +- src/process-window.c | 22 + src/settings-dialog.c | 6 +-- src/settings.c | 5 +-- src/task-manager-bsd.c | 14 ++ src/task-manager-freebsd.c | 73 ++ src/task-manager-linux.c | 37 +--- src/task-manager-skel.c| 7 ++- src/task-manager-solaris.c | 26 +-- src/task-manager.c | 83 ++ src/task-manager.h | 20 - 17 files changed, 219 insertions(+), 271 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 02/02: I18n: Update translation ru (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. commit 1860f2ce8e25ba63ace11b0f4af22b899dcfeff7 Author: Igor Date: Wed May 30 18:30:29 2018 +0200 I18n: Update translation ru (100%). 334 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/ru.po | 333 --- 1 file changed, 169 insertions(+), 164 deletions(-) diff --git a/po/ru.po b/po/ru.po index 6c0dd9e..2580a07 100644 --- a/po/ru.po +++ b/po/ru.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Thunar Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-24 06:30+0200\n" -"PO-Revision-Date: 2018-05-24 13:08+\n" +"POT-Creation-Date: 2018-05-30 06:30+0200\n" +"PO-Revision-Date: 2018-05-30 12:33+\n" "Last-Translator: Igor \n" "Language-Team: Russian (http://www.transifex.com/xfce/thunar-plugins/language/ru/)\n" "MIME-Version: 1.0\n" @@ -30,8 +30,8 @@ msgstr "Добавить" #: ../thunar-vcs-plugin/tvp-git-action.c:242 #: ../thunar-vcs-plugin/tvp-svn-action.c:280 ../tvp-git-helper/main.c:153 #: ../tvp-git-helper/tgh-add.c:108 ../tvp-git-helper/tgh-add.c:121 -#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:119 -#: ../tvp-svn-helper/tsh-add.c:132 +#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:135 +#: ../tvp-svn-helper/tsh-add.c:148 msgid "Add" msgstr "Добавить" @@ -103,7 +103,7 @@ msgstr "Фиксировать" #: ../thunar-vcs-plugin/tvp-svn-action.c:312 #: ../tvp-git-helper/tgh-log-dialog.c:153 #: ../tvp-git-helper/tgh-status-dialog.c:97 ../tvp-svn-helper/main.c:279 -#: ../tvp-svn-helper/tsh-commit.c:241 ../tvp-svn-helper/tsh-commit.c:254 +#: ../tvp-svn-helper/tsh-commit.c:260 ../tvp-svn-helper/tsh-commit.c:273 msgid "Commit" msgstr "Фиксировать" @@ -114,7 +114,7 @@ msgstr "Сравнить" #: ../thunar-vcs-plugin/tvp-git-action.c:253 #: ../thunar-vcs-plugin/tvp-svn-action.c:327 ../tvp-svn-helper/main.c:291 -#: ../tvp-svn-helper/tsh-diff.c:218 ../tvp-svn-helper/tsh-diff-dialog.c:137 +#: ../tvp-svn-helper/tsh-diff.c:226 ../tvp-svn-helper/tsh-diff-dialog.c:136 msgid "Diff" msgstr "Сравнить" @@ -169,7 +169,7 @@ msgstr "Переименовать" #: ../thunar-vcs-plugin/tvp-git-action.c:260 #: ../thunar-vcs-plugin/tvp-svn-action.c:372 ../tvp-git-helper/main.c:177 -#: ../tvp-svn-helper/main.c:311 ../tvp-svn-helper/tsh-move.c:170 +#: ../tvp-svn-helper/main.c:311 ../tvp-svn-helper/tsh-move.c:174 msgid "Move" msgstr "Переименовать" @@ -240,7 +240,7 @@ msgstr "Состояние" #: ../thunar-vcs-plugin/tvp-svn-action.c:409 ../tvp-git-helper/main.c:189 #: ../tvp-git-helper/tgh-file-selection-dialog.c:121 #: ../tvp-git-helper/tgh-status-dialog.c:124 ../tvp-svn-helper/main.c:331 -#: ../tvp-svn-helper/tsh-file-selection-dialog.c:151 +#: ../tvp-svn-helper/tsh-file-selection-dialog.c:150 #: ../tvp-svn-helper/tsh-status-dialog.c:246 msgid "Status" msgstr "Состояние" @@ -293,7 +293,7 @@ msgid "Menu|Copy" msgstr "Копировать" #: ../thunar-vcs-plugin/tvp-svn-action.c:317 ../tvp-svn-helper/main.c:283 -#: ../tvp-svn-helper/tsh-copy.c:177 +#: ../tvp-svn-helper/tsh-copy.c:183 msgid "Copy" msgstr "Копировать" @@ -302,7 +302,7 @@ msgid "Menu|Delete" msgstr "Удалить" #: ../thunar-vcs-plugin/tvp-svn-action.c:322 ../tvp-svn-helper/main.c:287 -#: ../tvp-svn-helper/tsh-delete.c:140 ../tvp-svn-helper/tsh-delete.c:153 +#: ../tvp-svn-helper/tsh-delete.c:139 ../tvp-svn-helper/tsh-delete.c:152 msgid "Delete" msgstr "Удалить" @@ -311,7 +311,7 @@ msgid "Menu|Export" msgstr "Экспорт" #: ../thunar-vcs-plugin/tvp-svn-action.c:332 ../tvp-svn-helper/main.c:295 -#: ../tvp-svn-helper/tsh-export.c:114 ../tvp-svn-helper/tsh-export.c:132 +#: ../tvp-svn-helper/tsh-export.c:113 ../tvp-svn-helper/tsh-export.c:131 msgid "Export" msgstr "Экспорт" @@ -320,7 +320,7 @@ msgid "Menu|Import" msgstr "Импорт" #: ../thunar-vcs-plugin/tvp-svn-action.c:337 ../tvp-svn-helper/main.c:299 -#: ../tvp-svn-helper/tsh-import.c:115 ../tvp-svn-helper/tsh-import.c:133 +#: ../tvp-svn-helper/tsh-import.c:120 ../tvp-svn-helper/tsh-import.c:138 msgid "Import" msgstr "Импорт" @@ -354,7 +354,7 @@ msgid "Menu|Relocate" msgstr "Переместить" #: ../thunar-vcs-plugin/tvp-svn-action.c:388 ../tvp-svn-helper/main.c:323 -#: ../tvp-svn-helper/tsh-relocate.c:125 +#: ../tvp-svn-helper/tsh-relocate.c:124 #: ../tvp-svn-helper/tsh-relocate-dialog.c:214 msgid "Relocate" msgstr "Переместить" @@ -364,7 +364,7 @@ msgid "Menu|Resolved" msgstr "Решено" #: ../thunar-vcs-plugin/tvp-svn-action.c:394 ../tvp-svn-helper/main.c:319 -#: ../tvp-svn-helper/tsh-common.c:536 ../tvp-svn-helper/tsh-resolved.c:115 +#: ../tvp-svn-helper/tsh-common.c:539 ../tvp-svn-helper/tsh-resolved.c:115 #:
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] branch master updated (7215a0c -> 1860f2c)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from 7215a0c Replace deprecated svn functions new 4f1d843 I18n: Update translation pl (100%). new 1860f2c I18n: Update translation ru (100%). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/pl.po | 730 --- po/ru.po | 333 +++-- 2 files changed, 590 insertions(+), 473 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 01/02: I18n: Update translation pl (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. commit 4f1d843109a21648d1100b81e95074cb4d8ff55e Author: Anonymous Date: Wed May 30 18:30:29 2018 +0200 I18n: Update translation pl (100%). 334 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/pl.po | 730 --- 1 file changed, 421 insertions(+), 309 deletions(-) diff --git a/po/pl.po b/po/pl.po index e29ddd6..a102954 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Saibamen , 2015 +# Adam Stachowicz , 2015 # elzear , 2014 # Hoek , 2014 # Kamil "elder" P. , 2016 -# m4sk1n , 2017 -# m4sk1n , 2016 -# No Ne, 2017 +# Marcin Mikołajczak , 2017 +# Marcin Mikołajczak , 2016 +# No Ne, 2017-2018 # Paweł Klimek , 2014 # , 2009 # Piotr Strębski , 2014-2015 @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: Thunar Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-02-17 00:30+0100\n" -"PO-Revision-Date: 2017-11-06 13:35+\n" +"POT-Creation-Date: 2018-05-30 06:30+0200\n" +"PO-Revision-Date: 2018-05-30 14:31+\n" "Last-Translator: No Ne\n" "Language-Team: Polish (http://www.transifex.com/xfce/thunar-plugins/language/pl/)\n" "MIME-Version: 1.0\n" @@ -27,397 +27,394 @@ msgstr "" "Language: pl\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: ../thunar-vcs-plugin/tvp-git-action.c:263 -#: ../thunar-vcs-plugin/tvp-svn-action.c:300 +#: ../thunar-vcs-plugin/tvp-git-action.c:242 +#: ../thunar-vcs-plugin/tvp-svn-action.c:280 msgid "Menu|Add" msgstr "Menu|Dodaj" -#: ../thunar-vcs-plugin/tvp-git-action.c:263 -#: ../thunar-vcs-plugin/tvp-svn-action.c:300 ../tvp-git-helper/main.c:153 +#: ../thunar-vcs-plugin/tvp-git-action.c:242 +#: ../thunar-vcs-plugin/tvp-svn-action.c:280 ../tvp-git-helper/main.c:153 #: ../tvp-git-helper/tgh-add.c:108 ../tvp-git-helper/tgh-add.c:121 -#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:119 -#: ../tvp-svn-helper/tsh-add.c:132 +#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:135 +#: ../tvp-svn-helper/tsh-add.c:148 msgid "Add" msgstr "Dodaj" -#: ../thunar-vcs-plugin/tvp-git-action.c:264 +#: ../thunar-vcs-plugin/tvp-git-action.c:243 msgid "Menu|Bisect" msgstr "Menu|Dzielenia na połowę" -#: ../thunar-vcs-plugin/tvp-git-action.c:264 +#: ../thunar-vcs-plugin/tvp-git-action.c:243 msgid "Bisect" msgstr "Podziel na połowę" -#: ../thunar-vcs-plugin/tvp-git-action.c:266 -#: ../thunar-vcs-plugin/tvp-svn-action.c:305 +#: ../thunar-vcs-plugin/tvp-git-action.c:245 +#: ../thunar-vcs-plugin/tvp-svn-action.c:285 msgid "Menu|Blame" msgstr "Menu|Wina" -#: ../thunar-vcs-plugin/tvp-git-action.c:266 -#: ../thunar-vcs-plugin/tvp-svn-action.c:305 ../tvp-git-helper/main.c:157 +#: ../thunar-vcs-plugin/tvp-git-action.c:245 +#: ../thunar-vcs-plugin/tvp-svn-action.c:285 ../tvp-git-helper/main.c:157 #: ../tvp-git-helper/tgh-blame-dialog.c:129 ../tvp-svn-helper/main.c:263 #: ../tvp-svn-helper/main.c:267 ../tvp-svn-helper/tsh-blame-dialog.c:132 msgid "Blame" msgstr "Wina" -#: ../thunar-vcs-plugin/tvp-git-action.c:268 +#: ../thunar-vcs-plugin/tvp-git-action.c:247 msgid "Menu|Branch" msgstr "Menu|Odgałęzienie" -#: ../thunar-vcs-plugin/tvp-git-action.c:268 ../tvp-git-helper/main.c:161 -#: ../tvp-git-helper/tgh-branch-dialog.c:144 -#: ../tvp-git-helper/tgh-stash-dialog.c:167 +#: ../thunar-vcs-plugin/tvp-git-action.c:247 ../tvp-git-helper/main.c:161 +#: ../tvp-git-helper/tgh-branch-dialog.c:140 +#: ../tvp-git-helper/tgh-stash-dialog.c:166 msgid "Branch" msgstr "Odgałęzienie" -#: ../thunar-vcs-plugin/tvp-git-action.c:269 -#: ../thunar-vcs-plugin/tvp-svn-action.c:322 +#: ../thunar-vcs-plugin/tvp-git-action.c:248 +#: ../thunar-vcs-plugin/tvp-svn-action.c:302 msgid "Menu|Checkout" msgstr "Utwórz lokalną kopię..." -#: ../thunar-vcs-plugin/tvp-git-action.c:269 -#: ../thunar-vcs-plugin/tvp-svn-action.c:322 ../tvp-svn-helper/main.c:271 +#: ../thunar-vcs-plugin/tvp-git-action.c:248 +#: ../thunar-vcs-plugin/tvp-svn-action.c:302 ../tvp-svn-helper/main.c:271 #: ../tvp-svn-helper/tsh-checkout.c:100 ../tvp-svn-helper/tsh-checkout.c:112 msgid "Checkout" msgstr "Tworzenie lokalnej kopii" -#: ../thunar-vcs-plugin/tvp-git-action.c:270 +#: ../thunar-vcs-plugin/tvp-git-action.c:249 msgid "Menu|Clean" msgstr "Menu|Czyszczenie" -#: ../thunar-vcs-plugin/tvp-git-action.c:270 ../tvp-git-helper/main.c:165 +#: ../thunar-vcs-plugin/tvp-git-action.c:249 ../tvp-git-helper/main.c:165 #: