[Xfce4-commits] [xfce/thunar] branch master updated (ab6bb1f -> 6ab799c)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/thunar.

  from  ab6bb1f   I18n: Update translation nl (100%).
   new  6ab799c   I18n: Update translation ko (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/ko.po | 16 +---
 1 file changed, 9 insertions(+), 7 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] [xfce/thunar] 01/01: I18n: Update translation ko (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 6ab799c28e9a8e38cb53af9041fa0be475445326
Author: 박정규(Jung-Kyu Park) 
Date:   Tue Dec 19 06:30:24 2017 +0100

I18n: Update translation ko (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ko.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index b1c813f..a95e6dd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 17:07+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-19 01:03+\n"
 "Last-Translator: 박정규(Jung-Kyu Park) \n"
 "Language-Team: Korean (http://www.transifex.com/xfce/thunar/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -23,14 +23,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "투나의 이전 인스턴스가 아직 실행 중이어서 투나를 시작할 수 없습니다.\n실행 중인 투나의 인스턴스를 종료하고 현재 인스턴스를 
시작하시겠습니까?\n\n수락하시기 전에 대기 중인 작업이 있는지 (예 : 파일 복사) 먼저 확인해 주세요 바로 종료하면 파일이 손상될 수 
있습니다."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "투나의 오래된 인스턴스가 아직 실행 중이기 때문에 투나를 시작할 수 없습니다.\n지금 투나의 오래된 인스턴스를 
종료하시겠습니까?\n\n수락하시기 전에 대기 중인 작업(예 : 파일 복사)이 있는지 확인해 주세요, 종료하면 파일이 손상될 수 
있습니다.\n\n이후에 투나를 다시 시작해주세요."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "투나"
 

-- 
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] [xfce/xfce4-power-manager] 01/01: Add support for XF86Battery button (Bug #14055)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
commit to branch 
master
in repository xfce/xfce4-power-manager.

commit ebb984e33b6daf6ce320140ff4c31d533d6a3cee
Author: Viktor Odintsev 
Date:   Mon Dec 4 14:15:31 2017 +0300

Add support for XF86Battery button (Bug #14055)
---
 common/xfpm-config.h |  1 +
 common/xfpm-enum.h   |  3 +-
 data/interfaces/xfpm-settings.ui | 34 ++-
 settings/xfpm-settings-app.c |  4 +-
 settings/xfpm-settings.c | 91 +---
 settings/xfpm-settings.h |  1 +
 src/xfpm-button.c|  7 ++--
 src/xfpm-button.h|  2 +-
 src/xfpm-main.c  |  4 ++
 src/xfpm-manager.c   | 12 +-
 src/xfpm-xfconf.c| 13 ++
 11 files changed, 158 insertions(+), 14 deletions(-)

diff --git a/common/xfpm-config.h b/common/xfpm-config.h
index da0ff89..35f646d 100644
--- a/common/xfpm-config.h
+++ b/common/xfpm-config.h
@@ -60,6 +60,7 @@ G_BEGIN_DECLS
 #define POWER_SWITCH_CFG "power-button-action"
 #define HIBERNATE_SWITCH_CFG "hibernate-button-action"
 #define SLEEP_SWITCH_CFG "sleep-button-action"
+#define BATTERY_SWITCH_CFG   "battery-button-action"
 #define LID_SWITCH_ON_AC_CFG "lid-action-on-ac"
 #define LID_SWITCH_ON_BATTERY_CFG"lid-action-on-battery"
 
diff --git a/common/xfpm-enum.h b/common/xfpm-enum.h
index 0146f6e..ce5d5f7 100644
--- a/common/xfpm-enum.h
+++ b/common/xfpm-enum.h
@@ -47,7 +47,8 @@ typedef enum
 HIBERNATE_KEY  = (1 << 4),
 POWER_KEY  = (1 << 5),
 KBD_BRIGHTNESS_KEY_UP  = (1 << 6),
-KBD_BRIGHTNESS_KEY_DOWN= (1 << 7)
+KBD_BRIGHTNESS_KEY_DOWN= (1 << 7),
+BATTERY_KEY = (1 << 8)
 
 } XfpmKeys;
 
diff --git a/data/interfaces/xfpm-settings.ui b/data/interfaces/xfpm-settings.ui
index 143d1d2..bd09980 100644
--- a/data/interfaces/xfpm-settings.ui
+++ b/data/interfaces/xfpm-settings.ui
@@ -345,6 +345,18 @@
   
 
 
+  
+True
+False
+0
+When battery button is pressed:
+  
+  
+0
+3
+  
+
+
   
 True
 False
@@ -399,6 +411,24 @@
   
 
 
+  
+True
+False
+True
+
+
+  
+  
+0
+  
+
+  
+  
+1
+3
+  
+
+
   
 True
 True
@@ -406,7 +436,7 @@
   
   
 1
-3
+4
   
 
 
@@ -420,7 +450,7 @@
   
   
 0
-3
+4
   
 
   
diff --git a/settings/xfpm-settings-app.c b/settings/xfpm-settings-app.c
index 790e22d..72c48a1 100644
--- a/settings/xfpm-settings-app.c
+++ b/settings/xfpm-settings-app.c
@@ -140,6 +140,7 @@ xfpm_settings_app_launch (GApplication *app)
 gboolean has_sleep_button;
 gboolean has_hibernate_button;
 gboolean has_power_button;
+gboolean has_battery_button;
 gboolean has_lid;
 gint start_xfpm_if_not_running;
 
@@ -250,6 +251,7 @@ xfpm_settings

[Xfce4-commits] [xfce/xfce4-power-manager] branch master updated (c4677e8 -> ebb984e)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
change to branch 
master
in repository xfce/xfce4-power-manager.

  from  c4677e8   Back to development
   new  ebb984e   Add support for XF86Battery button (Bug #14055)

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:
 common/xfpm-config.h |  1 +
 common/xfpm-enum.h   |  3 +-
 data/interfaces/xfpm-settings.ui | 34 ++-
 settings/xfpm-settings-app.c |  4 +-
 settings/xfpm-settings.c | 91 +---
 settings/xfpm-settings.h |  1 +
 src/xfpm-button.c|  7 ++--
 src/xfpm-button.h|  2 +-
 src/xfpm-main.c  |  4 ++
 src/xfpm-manager.c   | 12 +-
 src/xfpm-xfconf.c| 13 ++
 11 files changed, 158 insertions(+), 14 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] [panel-plugins/xfce4-time-out-plugin] branch master updated (799b2b1 -> 35a96ef)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

  from  799b2b1   I18n: Update translation ru (100%).
   new  35a96ef   I18n: Update translation eo (97%).

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/eo.po | 14 --
 1 file changed, 12 insertions(+), 2 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] [panel-plugins/xfce4-time-out-plugin] 01/01: I18n: Update translation eo (97%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

commit 35a96ef31c251d8102e03cb11317db239a33a914
Author: Iris Ilexiris 
Date:   Tue Dec 19 00:32:26 2017 +0100

I18n: Update translation eo (97%).

34 translated messages, 1 untranslated message.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/eo.po | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/po/eo.po b/po/eo.po
index 79e5253..50b4028 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:31+0200\n"
-"PO-Revision-Date: 2017-11-24 23:21+\n"
+"POT-Creation-Date: 2017-12-16 18:32+0100\n"
+"PO-Revision-Date: 2017-12-18 20:56+\n"
 "Last-Translator: Iris Ilexiris \n"
 "Language-Team: Esperanto 
(http://www.transifex.com/xfce/xfce-panel-plugins/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,11 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Create label for displaying the remaining time until the next break
+#: ../panel-plugin/time-out.c:211
+msgid "Inactive"
+msgstr "Malaktiva"
+
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:264
 msgid "Take a break"
@@ -103,6 +108,11 @@ msgstr "Rekomenci aŭtomate"
 msgid "Appearance"
 msgstr "Aspekto"
 
+#. Create note label
+#: ../panel-plugin/time-out.c:601
+msgid "Note: Icon and time cannot be hidden simultaneously."
+msgstr ""
+
 #. Create display icon check button
 #: ../panel-plugin/time-out.c:606
 msgid "Display icon"

-- 
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] [xfce/thunar] 01/02: I18n: Update translation da (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit ded21f03ca2d89986ae71338be2cb9a0dfd4b776
Author: Anonymous 
Date:   Tue Dec 19 00:30:24 2017 +0100

I18n: Update translation da (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/da.po | 56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/po/da.po b/po/da.po
index af9e778..e4ee69f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 00:30+0100\n"
-"PO-Revision-Date: 2017-12-12 23:11+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 20:44+\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/xfce/thunar/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +22,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar kan ikke startes da en ældre instans af thunar stadig 
kører.\nVil du afslutte den gamle thunar-instans og starte denne 
instans?\n\nSørg venligst for at der ikke er nogen afventende handlinger inden 
du accepterer (f.eks. filkopiering), da det kan ødelægge dine filer."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar kunne ikke startes da en ældre instans af thunar stadig 
kører.\nVil du afslutte den gamle thunar-instans nu?\n\nSørg venligst for at 
der ikke er nogen afventende handlinger inden du accepterer (f.eks. 
filkopiering), da det vil kunne ødelægge dine filer.\n\nGenstart venligst 
thunar bagefter."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -578,7 +580,7 @@ msgstr "_Udvid automatisk kolonner efter behov"
 #. reset page title
 #. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:703
-#: ../thunar/thunar-list-model.c:731
+#: ../thunar/thunar-list-model.c:739
 #: ../thunar/thunar-permissions-chooser.c:233 ../thunar/thunar-util.c:454
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:513
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:293
@@ -1021,8 +1023,8 @@ msgid "%s (copy %u)"
 msgstr "%s (kopiér %u)"
 
 #. I18N: name for first link to basename
-#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:748
-#: ../thunar/thunar-list-model.c:1573 ../thunar/thunar-list-model.c:1584
+#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:756
+#: ../thunar/thunar-list-model.c:1581 ../thunar/thunar-list-model.c:1592
 #: ../thunar/thunar-properties-dialog.c:998
 #, c-format
 msgid "link to %s"
@@ -1228,7 +1230,7 @@ msgid_plural "Send the selected files to \"%s\""
 msgstr[0] "Send valgte fil til \"%s\""
 msgstr[1] "Send valgte filer til \"%s\""
 
-#: ../thunar/thunar-list-model.c:2293
+#: ../thunar/thunar-list-model.c:2301
 #, c-format
 msgid "%d item (%s), Free space: %s"
 msgid_plural "%d items (%s), Free space: %s"
@@ -1236,49 +1238,49 @@ msgstr[0] "%d element (%s), ledig plads: %s"
 msgstr[1] "%d elementer (%s), ledig plads: %s"
 
 #. just the standard text
-#: ../thunar/thunar-list-model.c:2300
+#: ../thunar/thunar-list-model.c:2308
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
 msgstr[0] "%d element, ledig plads: %s"
 msgstr[1] "%d elementer, ledig plads: %s"
 
-#: ../thunar/thunar-list-model.c:2309
+#: ../thunar/thunar-list-model.c:2317
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
 msgstr[0] "%d element"
 msgstr[1] "%d elementer"
 
-#: ../thunar/thunar-list-model.c:2325
+#: ../thunar/thunar-list-model.c:2333
 #, c-format
 msgid "\"%s\" broken link"
 msgstr "\"%s\" ugyldig henvisning"
 
-#: ../thunar/thunar-list-model.c:2330
+#: ../thunar/thunar-list-model.c:2338
 #, c-format
 msgid "\"%s\" (%s) link to %s"
 msgstr "\"%s\" (%s) henvisning til %s"
 
-#: ../thunar/thunar-list-model.c:2336
+#: ../thunar/thunar-list-model.c:2344
 #, c-format
 msgid "\"%s\" shortcut"
 msgstr "\"%s\" genvej"
 
-#: ../thunar/thunar-list-model.c:2340
+#: ../thunar/thunar-list

[Xfce4-commits] [xfce/thunar] 02/02: I18n: Update translation nl (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit ab6bb1f624e903ead8ed6a838bd166853484c570
Author: Pjotr 
Date:   Tue Dec 19 00:30:24 2017 +0100

I18n: Update translation nl (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/nl.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index 1074fa9..fb632df 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 22:39+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 19:54+\n"
 "Last-Translator: Pjotr \n"
 "Language-Team: Dutch (http://www.transifex.com/xfce/thunar/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,14 +21,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar kan niet worden gestart omdat er al een oudere instantie van 
Thunar draait.\nWilt u de oudere Thunar-instantie afbreken en deze instantie 
starten?\n\nAlvorens dit te aanvaarden, zorg er a.u.b. voor dat er geen 
bewerkingen gaande zijn (bijv. kopiëren van bestanden), aangezien afbreken voor 
bestandscorruptie kan zorgen."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar kon niet worden gestart omdat er al een oudere instantie van 
Thunar draait.\nWilt u de oudere Thunar-instantie nu sluiten?\n\nVoordat u dit 
doet: zorg er a.u.b. voor er geen bewerkingen gaande zijn (zoals kopiëren van 
bestanden), aangezien het afbreken daarvan kan leiden tot corrupte 
bestanden.\n\nHerstart a.u.b. daarna Thunar."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 

-- 
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] [xfce/thunar] branch master updated (68f8e0d -> ab6bb1f)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/thunar.

  from  68f8e0d   I18n: Update translation ru (100%).
   new  ded21f0   I18n: Update translation da (100%).
   new  ab6bb1f   I18n: Update translation nl (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/da.po | 56 +---
 po/nl.po | 16 +---
 2 files changed, 38 insertions(+), 34 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] [xfce/xfce4-power-manager] 01/01: Back to development

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
commit to branch 
master
in repository xfce/xfce4-power-manager.

commit c4677e8ed8dff04a9e219cc2f5ecab1afcb87006
Author: Simon Steinbeiss 
Date:   Tue Dec 19 00:19:43 2017 +0100

Back to development
---
 configure.ac.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac.in b/configure.ac.in
index 74a05b2..f446d7c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ m4_define([xfpm_version_major], [1])
 m4_define([xfpm_version_minor], [6])
 m4_define([xfpm_version_micro], [1])
 m4_define([xfpm_version_build], [@REVISION@])
-m4_define([xfpm_version_tag],   [])
+m4_define([xfpm_version_tag],   [git])
 m4_define([xfpm_version], 
[xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(),
 [git], [xfpm_version_tag()-xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager],[xfpm_version],[http://bugzilla.xfce.org/])

-- 
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] [xfce/xfce4-power-manager] branch master updated (98b78e6 -> c4677e8)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
change to branch 
master
in repository xfce/xfce4-power-manager.

  from  98b78e6   Updates for release
   new  c4677e8   Back to development

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:
 configure.ac.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
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] [xfce/xfce4-power-manager] annotated tag xfce4-power-manager-1.6.1 created (now 88ae26d)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
change to annotated 
tag 
xfce4-power-manager-1.6.1
in repository xfce/xfce4-power-manager.

at  88ae26d   (tag)
   tagging  98b78e6e1dc7ff19cf6432094dfda1b20cfa4205 (commit)
  replaces  xfce4-power-manager-1.6.0
 tagged by  Simon Steinbeiss
on  Tue Dec 19 00:17:01 2017 +0100

- Log -
1.6.1
=
New stable release of xfce4-power-manager.

* Bugfixes:
 - plugin:
   - Use libxfce4panel function to obtain desired icon size
   - Fix menu leak, attach menu to button (Bug #13466)
   - Hide label in unknown state (Bug #12851)
   - Add properties dialog (Bug #13270)
   - Set ac-adapter icon for desktop systems (Bug #13959)
   - Hide label by default on desktop systems
   - Block panel autohide if the menu is open
   - Drop deprecated CSS styles
 - Fix xfpm startup dialog ignoring response (Bug #13700)
 - Fix handling of dialog responses for suspend and hibernate (Bug #13405)
 - Set the transient hint for notifications
 - Fix scale description and values for light-locker (Bug #13303)
 - Drop period at end of all tooltip texts (Bug #12342)
 - Make tooltip more concise (Bug #12342)
 - When locking fallback to xflock4 first (Bug #12603)
 - Fix a crash when warning about the screenlocker (Bug #12603)
 - Fix showing inhibits in the systray (Bug #12605)
 - Fix the g_object_bindings in xfce-screensaver
 - Handle screensaver activity with it's own class (Bug #12603)
 - Fix the 3.20 deprecation warnings
 - Use the kernel-supplied backlight type rather than a whitelist (Bug #12553)
 - Fix build on FreeBSD and DragonFlyBSD (Bug #13984)
 - Add MATE to NotShowIn list (Bug #12506)

* Translation updates:
  Arabic, Asturian, Basque, Bulgarian, Catalan, Chinese (China),
  Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish,
  Dutch (Flemish), English (Australia), English (Great Britain),
  Estonian, Finnish, French, Galician, German, Greek, Hebrew, Hungarian,
  Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Lithuanian,
  Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan, Polish, Portuguese,
  Portuguese (Brazilian), Romanian, Russian, Serbian, Slovak, Slovenian,
  Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur, Vietnamese
---

No new revisions were added by this update.

-- 
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] [xfce/xfce4-power-manager] branch master updated (19005ca -> 98b78e6)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
change to branch 
master
in repository xfce/xfce4-power-manager.

  from  19005ca   I18n: Update translation zh_CN (100%).
   new  98b78e6   Updates for release

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:
 NEWS| 40 
 configure.ac.in |  4 ++--
 2 files changed, 42 insertions(+), 2 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] [xfce/xfce4-power-manager] 01/01: Updates for release

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

ochosi pushed a 
commit to branch 
master
in repository xfce/xfce4-power-manager.

commit 98b78e6e1dc7ff19cf6432094dfda1b20cfa4205
Author: Simon Steinbeiss 
Date:   Tue Dec 19 00:16:33 2017 +0100

Updates for release
---
 NEWS| 40 
 configure.ac.in |  4 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a5c8aa5..723e483 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,43 @@
+1.6.1
+=
+New stable release of xfce4-power-manager.
+
+* Bugfixes:
+ - plugin:
+   - Use libxfce4panel function to obtain desired icon size
+   - Fix menu leak, attach menu to button (Bug #13466)
+   - Hide label in unknown state (Bug #12851)
+   - Add properties dialog (Bug #13270)
+   - Set ac-adapter icon for desktop systems (Bug #13959)
+   - Hide label by default on desktop systems
+   - Block panel autohide if the menu is open
+   - Drop deprecated CSS styles
+ - Fix xfpm startup dialog ignoring response (Bug #13700)
+ - Fix handling of dialog responses for suspend and hibernate (Bug #13405)
+ - Set the transient hint for notifications
+ - Fix scale description and values for light-locker (Bug #13303)
+ - Drop period at end of all tooltip texts (Bug #12342)
+ - Make tooltip more concise (Bug #12342)
+ - When locking fallback to xflock4 first (Bug #12603)
+ - Fix a crash when warning about the screenlocker (Bug #12603)
+ - Fix showing inhibits in the systray (Bug #12605)
+ - Fix the g_object_bindings in xfce-screensaver
+ - Handle screensaver activity with it's own class (Bug #12603)
+ - Fix the 3.20 deprecation warnings
+ - Use the kernel-supplied backlight type rather than a whitelist (Bug #12553)
+ - Fix build on FreeBSD and DragonFlyBSD (Bug #13984)
+ - Add MATE to NotShowIn list (Bug #12506)
+
+* Translation updates:
+  Arabic, Asturian, Basque, Bulgarian, Catalan, Chinese (China),
+  Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish,
+  Dutch (Flemish), English (Australia), English (Great Britain),
+  Estonian, Finnish, French, Galician, German, Greek, Hebrew, Hungarian,
+  Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Lithuanian,
+  Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan, Polish, Portuguese,
+  Portuguese (Brazilian), Romanian, Russian, Serbian, Slovak, Slovenian,
+  Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur, Vietnamese
+
 1.6.0
 =
 New stable release of xfce4-power-manager.
diff --git a/configure.ac.in b/configure.ac.in
index 33faf1c..74a05b2 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -1,9 +1,9 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major], [1])
 m4_define([xfpm_version_minor], [6])
-m4_define([xfpm_version_micro], [0])
+m4_define([xfpm_version_micro], [1])
 m4_define([xfpm_version_build], [@REVISION@])
-m4_define([xfpm_version_tag],   [git])
+m4_define([xfpm_version_tag],   [])
 m4_define([xfpm_version], 
[xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(),
 [git], [xfpm_version_tag()-xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager],[xfpm_version],[http://bugzilla.xfce.org/])

-- 
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] [panel-plugins/xfce4-time-out-plugin] 01/01: I18n: Update translation ru (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

commit 799b2b11e08cefd3cbdfb333ce326f6fbb789f6b
Author: Igor 
Date:   Mon Dec 18 18:32:34 2017 +0100

I18n: Update translation ru (100%).

35 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ru.po | 22 --
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 7e508e8..ad532a0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -5,13 +5,13 @@
 # Translators:
 # Aleksandr P , 2010
 # dima , 2010
-# Igor , 2016
+# Igor , 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:31+0200\n"
-"PO-Revision-Date: 2017-09-19 18:06+\n"
+"POT-Creation-Date: 2017-12-16 18:32+0100\n"
+"PO-Revision-Date: 2017-12-18 13:58+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Russian 
(http://www.transifex.com/xfce/xfce-panel-plugins/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || 
(n%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. Create label for displaying the remaining time until the next break
+#: ../panel-plugin/time-out.c:211
+msgid "Inactive"
+msgstr "Неактивно"
+
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:264
 msgid "Take a break"
@@ -28,12 +33,12 @@ msgstr "Время отдохнуть"
 #. Create menu item for resetting the timer
 #: ../panel-plugin/time-out.c:272
 msgid "Reset timer"
-msgstr "Сброс"
+msgstr "Сбросить таймер"
 
 #. Create menu item for enabling/disabling the countdown
 #: ../panel-plugin/time-out.c:280
 msgid "Enabled"
-msgstr "Включён"
+msgstr "Включено"
 
 #. Update tooltips
 #: ../panel-plugin/time-out.c:344
@@ -43,7 +48,7 @@ msgstr "Приостановлено"
 #: ../panel-plugin/time-out.c:423
 msgid ""
 "Xfce Panel plugin for taking a break from computer work every now and then."
-msgstr "Позволяет делать перерывы в работе через определённые промежутки 
времени."
+msgstr "Модуль позволяет делать перерывы в работе через определённые 
промежутки времени."
 
 #: ../panel-plugin/time-out.c:432
 msgid "translator-credits"
@@ -104,6 +109,11 @@ msgstr "Автоматически продолжать работу"
 msgid "Appearance"
 msgstr "Внешний вид"
 
+#. Create note label
+#: ../panel-plugin/time-out.c:601
+msgid "Note: Icon and time cannot be hidden simultaneously."
+msgstr "Прим.: нельзя одновременно спрятать значок и время."
+
 #. Create display icon check button
 #: ../panel-plugin/time-out.c:606
 msgid "Display icon"

-- 
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] [panel-plugins/xfce4-time-out-plugin] branch master updated (7816afb -> 799b2b1)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

  from  7816afb   I18n: Update translation zh_CN (97%).
   new  799b2b1   I18n: Update translation ru (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/ru.po | 22 --
 1 file changed, 16 insertions(+), 6 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] [xfce/thunar] 02/02: I18n: Update translation ru (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 68f8e0de3e9b8b8aa484d75823fee9803c517be3
Author: Igor 
Date:   Mon Dec 18 18:30:26 2017 +0100

I18n: Update translation ru (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ru.po | 56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 47a63d9..8f8e287 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 00:30+0100\n"
-"PO-Revision-Date: 2017-12-11 14:56+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 13:55+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Russian (http://www.transifex.com/xfce/thunar/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar не может быть запущен, так как его старый экземпляр всё ещё 
работает.\nХотите остановить старый экземпляр Thunar и запустить новый?\nПеред 
тем как согласиться, убедитесь, что нет никаких выполняющихся операций (таких 
как копирование файлов), так как их прерывание может повредить ваши файлы."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar не может быть запущен, так как его старый экземпляр всё ещё 
работает.\nХотите остановить старый экземпляр Thunar?\nПеред тем как 
согласиться, убедитесь, что нет никаких выполняющихся операций (таких как 
копирование файлов), так как их прерывание может повредить ваши файлы.\n\nЗатем 
перезапустите Thunar."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -582,7 +584,7 @@ msgstr "_Автоматически увеличивать ширину стол
 #. reset page title
 #. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:703
-#: ../thunar/thunar-list-model.c:731
+#: ../thunar/thunar-list-model.c:739
 #: ../thunar/thunar-permissions-chooser.c:233 ../thunar/thunar-util.c:454
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:513
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:293
@@ -1025,8 +1027,8 @@ msgid "%s (copy %u)"
 msgstr "%s (%u-я копия)"
 
 #. I18N: name for first link to basename
-#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:748
-#: ../thunar/thunar-list-model.c:1573 ../thunar/thunar-list-model.c:1584
+#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:756
+#: ../thunar/thunar-list-model.c:1581 ../thunar/thunar-list-model.c:1592
 #: ../thunar/thunar-properties-dialog.c:998
 #, c-format
 msgid "link to %s"
@@ -1260,7 +1262,7 @@ msgstr[1] "Отправить выбранные файлы на «%s»"
 msgstr[2] "Отправить выбранные файлы на «%s»"
 msgstr[3] "Отправить выбранные файлы на «%s»"
 
-#: ../thunar/thunar-list-model.c:2293
+#: ../thunar/thunar-list-model.c:2301
 #, c-format
 msgid "%d item (%s), Free space: %s"
 msgid_plural "%d items (%s), Free space: %s"
@@ -1270,7 +1272,7 @@ msgstr[2] "%d объектов (%s), свободно %s"
 msgstr[3] "%d объектов (%s), свободно %s"
 
 #. just the standard text
-#: ../thunar/thunar-list-model.c:2300
+#: ../thunar/thunar-list-model.c:2308
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
@@ -1279,7 +1281,7 @@ msgstr[1] "%d объекта, свободно %s"
 msgstr[2] "%d объектов, свободно %s"
 msgstr[3] "%d объектов, свободно %s"
 
-#: ../thunar/thunar-list-model.c:2309
+#: ../thunar/thunar-list-model.c:2317
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
@@ -1288,35 +1290,35 @@ msgstr[1] "%d объекта"
 msgstr[2] "%d объектов"
 msgstr[3] "%d объектов"
 
-#: ../thunar/thunar-list-model.c:2325
+#: ../thunar/thunar-list-model.c:2333
 #, c-format
 msgid "\"%s\" broken link"
 msgstr "«%s» битая ссылка"
 
-#: ../thunar/thunar-list-model.c:2330
+#: ../thunar/thunar-list-model.c:2338
 #, c-format
 msgid "\"%s\" (%s) link to %s"
 msgstr "«%s» (%s) ссылается на %s"
 
-#: ../thunar/thunar-list-model.c:2336
+#: ../thunar/thunar-list-model.c:2344
 #, c-format
 msgi

[Xfce4-commits] [xfce/thunar] 01/02: I18n: Update translation lt (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 288d5f502c0efd24d7875b36edfa87fd6ee5
Author: Anonymous 
Date:   Mon Dec 18 18:30:26 2017 +0100

I18n: Update translation lt (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/lt.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/lt.po b/po/lt.po
index e9f6c12..8285663 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 21:14+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 15:37+\n"
 "Last-Translator: Moo\n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/xfce/thunar/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -22,14 +22,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar negali būti paleista, nes vis dar veikia senesnės Thunar 
versijos egzempliorius.\nAr norėtumėte baigti senos Thunar versijos 
egzemplioriaus darbą ir paleisti šį egzempliorių?\n\nPrieš sutikdami, 
įsitikinkite, kad nėra jokių laukiančių operacijų (pvz., failų kopijavimo), nes 
palikus šias operacijas, jūsų failai gali būti sugadinti."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar negali būti paleista, nes vis dar veikia senesnės Thunar 
versijos egzempliorius.\nAr norėtumėte baigti senos Thunar versijos 
egzemplioriaus darbą dabar?\n\nPrieš sutikdami, įsitikinkite, kad nėra jokių 
laukiančių operacijų (pvz., failų kopijavimo), nes palikus šias operacijas, 
jūsų failai gali būti sugadinti.\n\nPo to, paleiskite Thunar iš naujo."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 

-- 
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] [xfce/thunar] branch master updated (a71a969 -> 68f8e0d)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/thunar.

  from  a71a969   I18n: Update translation zh_TW (100%).
   new  288d5f5   I18n: Update translation lt (100%).
   new  68f8e0d   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/lt.po | 16 +---
 po/ru.po | 56 +---
 2 files changed, 38 insertions(+), 34 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] [panel-plugins/xfce4-hardware-monitor-plugin] 27/29: Fix monitor type sync checkbutton initialisation

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 1ccfb0f151888370b9bbc0729c5770fa93c416da
Author: OmegaPhil 
Date:   Sun Dec 17 21:29:24 2017 +

Fix monitor type sync checkbutton initialisation
---
 src/preferences-window.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences-window.cpp b/src/preferences-window.cpp
index c2d277d..8b2662b 100644
--- a/src/preferences-window.cpp
+++ b/src/preferences-window.cpp
@@ -268,8 +268,8 @@ PreferencesWindow::PreferencesWindow(Plugin &plugin_, 
monitor_seq monitors)
   }
 
   // Monitor scale sharing per type in the view
-  if (plugin.get_viewer_monitor_type_sync_enabled())
-  monitor_type_sync_checkbutton->set_active();
+  monitor_type_sync_checkbutton->set_active(
+plugin.get_viewer_monitor_type_sync_enabled());
 
   // Make sure background colorbutton is grayed out
   background_color_radiobutton->toggled();

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 26/29: Ensure visualisations are on the bottom z-order wise so that text overlay is an overlay

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 5b2761e2585b658b26e7856c5eb854e78442372d
Author: OmegaPhil 
Date:   Sun Dec 17 20:57:32 2017 +

Ensure visualisations are on the bottom z-order wise so that text overlay 
is an overlay
---
 src/bar-view.cpp| 50 --
 src/column-view.cpp |  9 -
 src/flame-view.cpp  |  9 +++--
 3 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 25a6608..688ba03 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -74,29 +74,32 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
 { 
   unsigned int outline_color = outlineified(fill_color);
 
-  // calculate parameters
+  // Calculate parameters
   int box_size;
-  // use min_spacing at least, except for last box which doesn't need spacing
+
+  // Use min_spacing at least, except for last box which doesn't need spacing
   int total_no_boxes;
   double box_spacing;
 
-  if (this->horizontal) {
+  if (this->horizontal)
+  {
 box_size = 3;
 int const min_spacing = 2;
 total_no_boxes = (width + min_spacing) / (box_size + min_spacing);
 box_spacing = (double(width) - box_size * total_no_boxes) / 
(total_no_boxes - 1);
   }
-  else {
-// Assume that a vertical view has limited space, thus the number of boxes
-// is hardcoded
+  else
+  {
+/* Assume that a vertical view has limited space, thus the number of boxes
+ * is hardcoded */
 total_no_boxes = 5;
 box_spacing = 2;
 int const total_no_spacings = total_no_boxes - 1;
-box_size = int(double(height - (total_no_spacings * box_spacing)) / 
total_no_boxes);
+box_size = int(double(height -
+  (total_no_spacings * box_spacing)) / total_no_boxes);
   }
   
-  
-  // don't attain new value immediately
+  // Don't attain new value immediately
   double value = old_value * (1 - time_offset) + new_value * time_offset;
 
   if (max <= 0)
@@ -115,23 +118,32 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
   if (alpha == 0)   // x.0 should give an opaque last box
 alpha = 1;
   
-  // trim/expand boxes list
+  /* Trim/expand boxes list, lower to bottom in the canvas' 'z-order' so that
+   * the new text overlay is actually an overlay */
   while (boxes.size() < no_boxes)
-boxes.push_back(new Gnome::Canvas::Rect(*canvas.root()));
-  while (boxes.size() > no_boxes) {
+  {
+Gnome::Canvas::Rect *rect = new Gnome::Canvas::Rect(*canvas.root());
+rect->lower_to_bottom();
+boxes.push_back(rect);
+  }
+  while (boxes.size() > no_boxes)
+  {
 delete boxes.back();
 boxes.pop_back();
   }
 
   double coord = this->horizontal ? 0 : height;
-  // update parameters, starting from left
+
+  // Update parameters, starting from left
   for (box_sequence::iterator i = boxes.begin(), end = boxes.end(); i != end;
-   ++i) {
+   ++i)
+  {
 Gnome::Canvas::Rect &rect = **i;
 rect.property_fill_color_rgba() = fill_color;
 rect.property_outline_color_rgba() = outline_color;
 
-if (this->horizontal) {
+if (this->horizontal)
+{
   rect.property_x1() = coord;
   rect.property_x2() = coord + box_size;
   rect.property_y1() = double(height) * no / total + 1;
@@ -139,7 +151,8 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
   
   coord += box_size + box_spacing;
 }
-else {
+else
+{
   rect.property_x1() = double(width) * no / total + 1;
   rect.property_x2() = double(width) * (no + 1) / total - 1;
   rect.property_y1() = coord;
@@ -149,8 +162,9 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
 }
   }
 
-  // tint last box
-  if (!boxes.empty()) {
+  // Tint last box
+  if (!boxes.empty())
+  {
 Gnome::Canvas::Rect &last = *boxes.back();
 last.property_fill_color_rgba()
   = (fill_color & 0xff00) |
diff --git a/src/column-view.cpp b/src/column-view.cpp
index 08e10e8..3b9a625 100644
--- a/src/column-view.cpp
+++ b/src/column-view.cpp
@@ -121,7 +121,14 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas, 
Plugin *plugin, int width,
   
   // Update columns
   if (columns.get() == 0)
-columns.reset(new Gnome::Canvas::Pixbuf(*canvas.root(), 0, 0, pixbuf));
+  {
+/* Make sure the new Gnome Canvas pixbuff is lower to bottom in the canvas'
+ * 'z-order' so that the new text overlay is actually an overlay */
+Gnome::Canvas::Pixbuf *gc_pixbuff =
+new Gnome::Canvas::Pixbuf(*canvas.root(), 0, 0, pixbuf);
+gc_pixbuff->lower_to_bottom();
+columns.reset(gc_pixbuff);
+  }
   else
 columns->property_pixbuf() = pixbuf;
 }
diff --git a/src/flame-view.cpp b/src/flame-view.cpp
index 5f96a80..8772dba 100644
--- a/src/flame-vi

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 29/29: Remove unused setter code

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit ee33421c8d22564bef933e0a4870c216b13d712b
Author: OmegaPhil 
Date:   Mon Dec 18 11:34:33 2017 +

Remove unused setter code
---
 src/monitor-impls.cpp | 130 --
 src/monitor-impls.hpp |  26 --
 src/monitor.hpp   |   6 +--
 3 files changed, 3 insertions(+), 159 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index 93b42b4..364b808 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -656,16 +656,6 @@ void CpuUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
-void CpuUsageMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void CpuUsageMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int CpuUsageMonitor::update_interval()
 {
   return update_interval_priv;
@@ -744,16 +734,6 @@ void SwapUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
-void SwapUsageMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void SwapUsageMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int SwapUsageMonitor::update_interval()
 {
   return update_interval_priv;
@@ -850,21 +830,6 @@ void LoadAverageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
-void LoadAverageMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void LoadAverageMonitor::set_max(double max)
-{
-  max_value = max;
-}
-
-void LoadAverageMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int LoadAverageMonitor::update_interval()
 {
   return update_interval_priv;
@@ -941,16 +906,6 @@ void MemoryUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
-void MemoryUsageMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void MemoryUsageMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int MemoryUsageMonitor::update_interval()
 {
   return update_interval_priv;
@@ -1054,16 +1009,6 @@ void DiskUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
-void DiskUsageMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void DiskUsageMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int DiskUsageMonitor::update_interval()
 {
   return update_interval_priv;
@@ -1387,21 +1332,6 @@ void DiskStatsMonitor::save(XfceRc *settings_w)
  "ran - current max value: %1", max_value));*/
 }
 
-void DiskStatsMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void DiskStatsMonitor::set_max(double max)
-{
-  max_value = max;
-}
-
-void DiskStatsMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 Glib::ustring DiskStatsMonitor::stat_to_string(const DiskStatsMonitor::Stat 
&stat,
const bool short_ver)
 {
@@ -2106,26 +2036,11 @@ void NetworkLoadMonitor::save_interfaces(XfceRc 
*settings_w)
   interface_type_names[wireless_third].c_str());
 }
 
-void NetworkLoadMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
 void NetworkLoadMonitor::set_interface_name(InterfaceType type, const 
Glib::ustring interface_name)
 {
   interface_type_names[type] = interface_name;
 }
 
-void NetworkLoadMonitor::set_max(double max)
-{
-  max_value = max;
-}
-
-void NetworkLoadMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int NetworkLoadMonitor::update_interval()
 {
   return update_interval_priv;
@@ -2342,21 +2257,6 @@ void TemperatureMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
-void TemperatureMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void TemperatureMonitor::set_max(double max)
-{
-  max_value = max;
-}
-
-void TemperatureMonitor::set_update_interval(int interval)
-{
-  update_interval_priv = interval;
-}
-
 int TemperatureMonitor::update_interval()
 {
   return update_interval_priv;
@@ -2428,16 +2328,6 @@ double FanSpeedMonitor::max()
   return max_value;
 }
 
-void FanSpeedMonitor::set_fixed_max(bool fixed_max)
-{
-  fixed_max_priv = fixed_max;
-}
-
-void FanSpeedMonitor::set_max(double max)
-{
-  max_value = max;
-}
-
 void FanSpeedMonitor::save(XfceRc *settings_w)
 {
 // Fetching assigned settings group
@@ -2464,11 +2354,6 @@ void FanSpeedMonitor::save(

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 28/29: Enable text overlay for all but TextView for the user to choose

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit fd4e084e20863954d96ae2ceebba072b4fb07fe4
Author: OmegaPhil 
Date:   Sun Dec 17 21:55:17 2017 +

Enable text overlay for all but TextView for the user to choose
---
 src/preferences-window.cpp | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/preferences-window.cpp b/src/preferences-window.cpp
index 8b2662b..2843f96 100644
--- a/src/preferences-window.cpp
+++ b/src/preferences-window.cpp
@@ -345,18 +345,21 @@ void PreferencesWindow::viewer_type_listener(const 
Glib::ustring viewer_type,
 bar_radiobutton->property_active() = enable;
 size_outer_vbox->property_visible() = enable;
 monitor_bar_options->property_visible() = enable;
+text_overlay_outer_vbox->property_visible() = enable;
   }
   else if (viewer_type == "vbar")
   {
 vbar_radiobutton->property_active() = enable;
 size_outer_vbox->property_visible() = enable;
 monitor_vbar_options->property_visible() = enable;
+text_overlay_outer_vbox->property_visible() = enable;
   }
   else if (viewer_type == "column")
   {
 column_radiobutton->property_active() = enable;
 size_outer_vbox->property_visible() = enable;
 monitor_column_options->property_visible() = enable;
+text_overlay_outer_vbox->property_visible() = enable;
   }
   else if (viewer_type == "text")
   {
@@ -368,6 +371,7 @@ void PreferencesWindow::viewer_type_listener(const 
Glib::ustring viewer_type,
 flame_radiobutton->property_active() = enable;
 size_outer_vbox->property_visible() = enable;
 monitor_flame_options->property_visible() = enable;
+text_overlay_outer_vbox->property_visible() = enable;
   }
 
   /* Actually changing the viewer type - background color use etc is set

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 24/29: Move out CurveView text overlay and do_draw_loop implementation to CanvasView

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 9a268f6f317196607af28e23a55b0597bd5c7617
Author: OmegaPhil 
Date:   Sun Dec 17 18:19:44 2017 +

Move out CurveView text overlay and do_draw_loop implementation to 
CanvasView

This allows for more than just the CurveView to implement a text
overlay, similarly for allowing maxima to be grouped per monitor
types. Just CurveView uses the new template function, others will
be next
---
 po/POTFILES.in |   1 +
 src/bar-view.cpp   |  29 
 src/bar-view.hpp   |  29 +++-
 src/canvas-view.cpp| 347 +++-
 src/canvas-view.hpp|  46 +-
 src/column-view.cpp|  28 
 src/column-view.hpp|  29 +++-
 src/curve-view.cpp | 352 ++---
 src/curve-view.hpp |  55 ---
 src/flame-view.cpp |  31 
 src/flame-view.hpp |  32 -
 src/plugin.cpp |  18 +--
 src/plugin.hpp |   6 +-
 src/preferences-window.cpp |  12 +-
 14 files changed, 529 insertions(+), 486 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 16d36df..e7b05d7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
 # Please keep this file sorted alphabetically.
 xfce4-hardware-monitor-plugin.desktop.in
 src/bar-view.cpp
+src/canvas-view.cpp
 src/choose-monitor-window.cpp
 src/column-view.cpp
 src/curve-view.cpp
diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 78e78e8..3601fa0 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -21,40 +21,11 @@
 #include // for ceil/floor
 #include // for max/min
 
-#include 
-
 #include "bar-view.hpp"
 #include "plugin.hpp"
 #include "monitor.hpp"
 
 
-//
-// class Bar - represents a single bar graph
-//
-
-class Bar
-{
-public:
-  Bar(Monitor *monitor, unsigned int fill_color, bool horizontal = false);
-  ~Bar();
-
-  void draw(Gnome::Canvas::Canvas &canvas,
-  Plugin *plugin, int width, int height, int no, int total,
-  double time_offset, double max);
-  double get_max_value();
-  void update();
-
-  Monitor *monitor;
-  
-private:
-  typedef std::vector box_sequence;
-  box_sequence boxes;
-
-  double old_value, new_value;
-  bool horizontal;
-  unsigned int fill_color;
-};
-
 Bar::Bar(Monitor *m, unsigned int c, bool horizontal)
   : monitor(m), old_value(0), new_value(0), fill_color(c)
 {
diff --git a/src/bar-view.hpp b/src/bar-view.hpp
index 2865df2..762935b 100644
--- a/src/bar-view.hpp
+++ b/src/bar-view.hpp
@@ -25,11 +25,38 @@
 #include 
 
 #include 
+#include 
+
 #include 
 
 #include "canvas-view.hpp"
 
-class Bar;
+//
+// class Bar - represents a single bar graph
+//
+
+class Bar
+{
+public:
+  Bar(Monitor *monitor, unsigned int fill_color, bool horizontal = false);
+  ~Bar();
+
+  void draw(Gnome::Canvas::Canvas &canvas,
+  Plugin *plugin, int width, int height, int no, int total,
+  double time_offset, double max);
+  double get_max_value();
+  void update();
+
+  Monitor *monitor;
+
+private:
+  typedef std::vector box_sequence;
+  box_sequence boxes;
+
+  double old_value, new_value;
+  bool horizontal;
+  unsigned int fill_color;
+};
 
 class BarView: public CanvasView
 {
diff --git a/src/canvas-view.cpp b/src/canvas-view.cpp
index 9474732..28d4ea3 100644
--- a/src/canvas-view.cpp
+++ b/src/canvas-view.cpp
@@ -26,18 +26,29 @@
 #include "canvas-view.hpp"
 #include "plugin.hpp"
 
+#include "bar-view.hpp"
+#include "curve-view.hpp"
+#include "flame-view.hpp"
+
 
 int const CanvasView::draw_interval = 100;
 int const CanvasView::draw_iterations = 10;
 
+// Text overlay format string substitution codes
+const Glib::ustring CanvasView::monitor_full = "%M";
+const Glib::ustring CanvasView::monitor_compact = "%m";
+const Glib::ustring CanvasView::graph_max_full = "%A";
+const Glib::ustring CanvasView::graph_max_compact = "%a";
+
 CanvasView::CanvasView(bool keeps_history)
-  : View(keeps_history)
+  : View(keeps_history), text_overlay(NULL)
 {
 }
 
 CanvasView::~CanvasView()
 {
-  draw_timer.disconnect();  // FIXME: is this enough to prevent crash?
+  draw_timer.disconnect();
+  delete text_overlay;
 }
 
 void CanvasView::do_display()
@@ -141,3 +152,335 @@ bool CanvasView::draw_loop()
   return true;
 }
 
+template 
+std::list> CanvasView::process_mon_maxes_text_overlay(
+typename std::list graph_elements)
+{
+  double max;
+  typename std::list> elems_and_maxes;
+
+  /* NULL references are not allowed, so those passed in must already be
+   * initialised */
+
+  // Monitor maxes maintained as a pair of , 
+  std::map> monitor_maxes;
+
+  // Monitors collected by type to allow easy access to separated data sets
+  typename std::ma

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 23/29: Allow user to configure when monitor scales are grouped by type or not in the visualisation

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit dab89691e719eb93b5b46a99a6a8e560e7d6a9d5
Author: OmegaPhil 
Date:   Tue Dec 12 16:36:44 2017 +

Allow user to configure when monitor scales are grouped by type or not in 
the visualisation
---
 src/curve-view.cpp |  11 +-
 src/plugin.cpp |  15 ++-
 src/plugin.hpp |   5 +-
 src/preferences-window.cpp |  49 +++-
 src/preferences-window.hpp |   5 +
 src/ui.glade   | 289 ++---
 6 files changed, 247 insertions(+), 127 deletions(-)

diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index 3f4b74b..8214ea9 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -286,7 +286,8 @@ void CurveView::do_draw_loop()
   monitor_data_needed = false, monitor_data_compact_needed = false,
   text_overlay_enabled = plugin->get_viewer_text_overlay_enabled();
 
-  /* Obtain maximum value of all curves in the view on a per monitor type 
basis,
+  /* Obtain maximum value of all curves in the view on a per monitor type basis
+   * but only when the user wants visualisations to be split by type,
* separately tracking fixed maxes incase all monitors are fixed. Graphs with
* fixed monitors are not supposed to be scaled, but the text overlay still
* needs to refer to a max if there are no normal monitors present
@@ -302,8 +303,12 @@ void CurveView::do_draw_loop()
   Glib::ustring mon_type;
   for (curve_iterator i = curves.begin(), end = curves.end(); i != end; ++i)
   {
-// To get the real type, Monitor* must be dereferrenced too...
-mon_type = typeid(*((*i)->monitor)).name();
+if (plugin->get_viewer_monitor_type_sync_enabled())
+{
+  // To get the real type, Monitor* must be dereferenced too...
+  mon_type = typeid(*((*i)->monitor)).name();
+}
+else mon_type = "All the same";
 
 // If the monitor type hasn't yet been recorded, zero the maxes
 it = monitor_maxes.find(mon_type);
diff --git a/src/plugin.cpp b/src/plugin.cpp
index dfb5af0..4b4e0ea 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -167,7 +167,8 @@ Plugin::Plugin(XfcePanelPlugin *xfce_plugin)
   viewer_text_overlay_separator(" "),
   viewer_text_overlay_font(""),
   viewer_text_overlay_color(0x00FF),
-  viewer_text_overlay_position(CurveView::top_left)
+  viewer_text_overlay_position(CurveView::top_left),
+  viewer_monitor_type_sync_enabled(true)
 {
   // Search for settings file
   XfceRc* settings_ro = NULL;
@@ -206,6 +207,8 @@ Plugin::Plugin(XfcePanelPlugin *xfce_plugin)
   "viewer_text_overlay_font", viewer_text_overlay_font.c_str());
 viewer_text_overlay_color = xfce_rc_read_int_entry(settings_ro,
   "viewer_text_overlay_color", viewer_text_overlay_color);
+viewer_monitor_type_sync_enabled = xfce_rc_read_bool_entry(settings_ro,
+  "viewer_monitor_type_sync_enabled", viewer_monitor_type_sync_enabled);
 
 // Enum is validated in set_viewer_text_overlay_position
 CurveView::TextOverlayPosition text_overlay_position =
@@ -568,6 +571,16 @@ void Plugin::set_viewer_text_overlay_enabled(bool enabled)
   viewer_text_overlay_enabled = enabled;
 }
 
+bool Plugin::get_viewer_monitor_type_sync_enabled() const
+{
+  return viewer_monitor_type_sync_enabled;
+}
+
+void Plugin::set_viewer_monitor_type_sync_enabled(bool enabled)
+{
+  viewer_monitor_type_sync_enabled = enabled;
+}
+
 const Glib::ustring Plugin::get_viewer_text_overlay_format_string()
 {
   return viewer_text_overlay_format_string;
diff --git a/src/plugin.hpp b/src/plugin.hpp
index 63c487c..f4aaa3f 100644
--- a/src/plugin.hpp
+++ b/src/plugin.hpp
@@ -71,6 +71,8 @@ public:
   void set_viewer_size(const int size);
   const Glib::ustring get_viewer_font();
   void set_viewer_font(const Glib::ustring font_details);
+  bool get_viewer_monitor_type_sync_enabled() const;
+  void set_viewer_monitor_type_sync_enabled(bool enabled);
   bool get_viewer_text_overlay_enabled() const;
   void set_viewer_text_overlay_enabled(bool enabled);
   const Glib::ustring get_viewer_text_overlay_format_string();
@@ -137,7 +139,8 @@ private:
 
   // data
   Glib::ustring icon_path, viewer_type, viewer_font;
-  bool viewer_text_overlay_enabled, viewer_text_overlay_use_font;
+  bool viewer_monitor_type_sync_enabled, viewer_text_overlay_enabled,
+   viewer_text_overlay_use_font;
   Glib::ustring viewer_text_overlay_format_string, 
viewer_text_overlay_separator,
 viewer_text_overlay_font;
   unsigned int viewer_text_overlay_color;
diff --git a/src/preferences-window.cpp b/src/preferences-window.cpp
index cc90ff1..4d3149e 100644
--- a/src/preferences-window.cpp
+++ b/src/preferences-window.cpp
@@ -146,6 +146,12 @@ PreferencesWindow::Pr

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 25/29: Port all view draw_loops to the new process_mon_maxes_text_overlay code

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 3b1479877bf8fa0db1a2856c2c6e82e9ca440b1c
Author: OmegaPhil 
Date:   Sun Dec 17 20:26:30 2017 +

Port all view draw_loops to the new process_mon_maxes_text_overlay code
---
 src/bar-view.cpp| 25 -
 src/canvas-view.cpp |  4 +++-
 src/column-view.cpp | 24 +++-
 src/flame-view.cpp  | 24 +++-
 4 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 3601fa0..25a6608 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -287,19 +287,18 @@ void BarView::do_draw_loop()
   int total = bars.size();
   int no = 0;
 
-  double max = 0;
-
-  /* Obtain maximum value of all columns in the view, ignoring any monitors 
with
-   * fixed maxes (their visualisations are not supposed to be scaled) */
-  for (bar_iterator i = bars.begin(), end = bars.end(); i != end; ++i)
-  {
-if (!(*i)->monitor->fixed_max() && (*i)->get_max_value() > max)
-  max = (*i)->get_max_value();
-  }
-
-  // Drawing bars with the unified max value
-  for (bar_iterator i = bars.begin(), end = bars.end(); i != end; ++i)
-(*i)->draw(*canvas, plugin, width(), height(), no++, total, time_offset, 
max);
+  /* Generating list of bars with correct maxima (unified and potentially
+   * grouped by monitor type) to then draw, and triggering processing of text
+   * overlay on the CanvasView if the user desires */
+  std::list> bars_and_maxes =
+  process_mon_maxes_text_overlay(bars);
+
+  /* Looping for all bars to draw - in the std::pair, first is the Bar,
+   * second is the max */
+  for (std::list>::iterator i = bars_and_maxes.begin(),
+   end = bars_and_maxes.end(); i != end; ++i)
+i->first->draw(*canvas, plugin, width(), height(), no++, total, 
time_offset,
+   i->second);
 
   ++draws_since_update;
 }
diff --git a/src/canvas-view.cpp b/src/canvas-view.cpp
index 28d4ea3..73a952c 100644
--- a/src/canvas-view.cpp
+++ b/src/canvas-view.cpp
@@ -27,6 +27,7 @@
 #include "plugin.hpp"
 
 #include "bar-view.hpp"
+#include "column-view.hpp"
 #include "curve-view.hpp"
 #include "flame-view.hpp"
 
@@ -481,6 +482,7 @@ template class std::list> 
CanvasView::process_mon_maxes_
 typename std::list graph_elements);
 template class std::list> 
CanvasView::process_mon_maxes_text_overlay(
 typename std::list graph_elements);
+template class std::list> 
CanvasView::process_mon_maxes_text_overlay(
+typename std::list graph_elements);
 template class std::list> 
CanvasView::process_mon_maxes_text_overlay(
 typename std::list graph_elements);
-
diff --git a/src/column-view.cpp b/src/column-view.cpp
index 0e7d260..08e10e8 100644
--- a/src/column-view.cpp
+++ b/src/column-view.cpp
@@ -242,17 +242,15 @@ void ColumnView::do_detach(Monitor *monitor)
 
 void ColumnView::do_draw_loop()
 {
-  double max = 0;
-
-  /* Obtain maximum value of all columns in the view, ignoring any monitors 
with
-   * fixed maxes (their graphs are not supposed to be scaled) */
-  for (column_iterator i = columns.begin(), end = columns.end(); i != end; ++i)
-  {
-if (!(*i)->monitor->fixed_max() && (*i)->get_max_value() > max)
-  max = (*i)->get_max_value();
-  }
-
-  // Drawing the columns with the unified max value
-  for (column_iterator i = columns.begin(), end = columns.end(); i != end; ++i)
-(*i)->draw(*canvas, plugin, width(), height(), max);
+  /* Generating list of columns with correct maxima (unified and potentially
+   * grouped by monitor type) to then draw, and triggering processing of text
+   * overlay on the CanvasView if the user desires */
+  std::list> columns_and_maxes =
+  process_mon_maxes_text_overlay(columns);
+
+  /* Looping for all columns to draw - in the std::pair, first is the
+   * ColumnGraph, second is the max */
+  for (std::list>::iterator i =
+   columns_and_maxes.begin(), end = columns_and_maxes.end(); i != end; ++i)
+i->first->draw(*canvas, plugin, width(), height(), i->second);
 }
diff --git a/src/flame-view.cpp b/src/flame-view.cpp
index b868d1a..5f96a80 100644
--- a/src/flame-view.cpp
+++ b/src/flame-view.cpp
@@ -313,17 +313,15 @@ void FlameView::do_detach(Monitor *monitor)
 
 void FlameView::do_draw_loop()
 {
-  double max = 0;
-
-  /* Obtain maximum value of all flames in the view, ignoring any monitors with
-   * fixed maxes (their visualisations are not supposed to be scaled) */
-  for (flame_iterator i = flames.begin(), end = flames.end(); i != end; ++i)
-  {
-if (!(*i)->monitor->fixed_max() && (*i)->get_max_value() > max)
-  max = (*i)->get_max_value();
-  }
-
-  // Drawing flames with the unified max value
-  for (flame_iterator i = flames.begin(),

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 21/29: Make Bar and Flame visualisations share a unified max from their monitors

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 57a1226e1139887710f813bcccb0d1b676d8249d
Author: OmegaPhil 
Date:   Sat Dec 9 20:28:32 2017 +

Make Bar and Flame visualisations share a unified max from their monitors
---
 src/bar-view.cpp  | 35 +--
 src/flame-view.cpp| 32 
 src/monitor-impls.cpp | 19 ---
 src/monitor-impls.hpp | 14 --
 src/plugin.cpp| 13 +
 src/plugin.hpp|  6 ++
 6 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index f24b2e4..78e78e8 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -38,10 +38,11 @@ public:
   Bar(Monitor *monitor, unsigned int fill_color, bool horizontal = false);
   ~Bar();
 
-  void update();
   void draw(Gnome::Canvas::Canvas &canvas,
   Plugin *plugin, int width, int height, int no, int total,
-  double time_offset);
+  double time_offset, double max);
+  double get_max_value();
+  void update();
 
   Monitor *monitor;
   
@@ -98,7 +99,7 @@ unsigned int outlineified(unsigned int color)
 
 void Bar::draw(Gnome::Canvas::Canvas &canvas,
  Plugin *plugin, int width, int height, int no, int total,
- double time_offset)
+ double time_offset, double max)
 { 
   unsigned int outline_color = outlineified(fill_color);
 
@@ -127,7 +128,6 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
   // don't attain new value immediately
   double value = old_value * (1 - time_offset) + new_value * time_offset;
 
-  double max = monitor->max();
   if (max <= 0)
 max = 0.001;
 
@@ -190,6 +190,18 @@ void Bar::draw(Gnome::Canvas::Canvas &canvas,
   }
 }
 
+double Bar::get_max_value()
+{
+  /* Used as part of determination of the max value for all bars in
+   * the view
+   * max is not tracked by the visualisation here */
+  double max = monitor->max();
+  if (max <= 0)
+max = 0.001;
+
+  return max;
+}
+
 
 //
 // class BarView
@@ -303,9 +315,20 @@ void BarView::do_draw_loop()
  
   int total = bars.size();
   int no = 0;
-  
+
+  double max = 0;
+
+  /* Obtain maximum value of all columns in the view, ignoring any monitors 
with
+   * fixed maxes (their visualisations are not supposed to be scaled) */
+  for (bar_iterator i = bars.begin(), end = bars.end(); i != end; ++i)
+  {
+if (!(*i)->monitor->fixed_max() && (*i)->get_max_value() > max)
+  max = (*i)->get_max_value();
+  }
+
+  // Drawing bars with the unified max value
   for (bar_iterator i = bars.begin(), end = bars.end(); i != end; ++i)
-(*i)->draw(*canvas, plugin, width(), height(), no++, total, time_offset);
+(*i)->draw(*canvas, plugin, width(), height(), no++, total, time_offset, 
max);
 
   ++draws_since_update;
 }
diff --git a/src/flame-view.cpp b/src/flame-view.cpp
index 18d01eb..67d9cab 100644
--- a/src/flame-view.cpp
+++ b/src/flame-view.cpp
@@ -39,10 +39,10 @@ class Flame
 public:
   Flame(Monitor *monitor, unsigned int color);
 
+  void burn(double overall_max);
+  double get_max_value();
   void update(Gnome::Canvas::Canvas &canvas,
 Plugin *plugin, int width, int height, int no, int total);
-
-  void burn();
   
   Monitor *monitor;
   
@@ -55,7 +55,7 @@ private:
   int next_refuel;
   int cooling;  // cooling factor
 
-  void recompute_fuel();
+  void recompute_fuel(double overall_max);
   unsigned int color;
 };
 
@@ -131,9 +131,9 @@ unsigned int random_between(unsigned int min, unsigned int 
max)
   return min + std::rand() % (max - min);
 }
 
-void Flame::recompute_fuel()
+void Flame::recompute_fuel(double overall_max)
 {
-  int ratio = int(value / max * 255);
+  int ratio = int(value / overall_max * 255);
 
   if (ratio > 255)
 ratio = 255;
@@ -167,7 +167,7 @@ void Flame::recompute_fuel()
 --next_refuel;
 }
 
-void Flame::burn()
+void Flame::burn(double overall_max)
 {
   if (!flame.get())
 return;
@@ -177,7 +177,7 @@ void Flame::burn()
   int width = pixbuf->get_width();
   int height = pixbuf->get_height();
 
-  recompute_fuel();
+  recompute_fuel(overall_max);
   
   // Process the lowest row
   PixelPosition lowest = get_position(pixbuf, 0, height - 1);
@@ -230,6 +230,11 @@ void Flame::burn()
   flame->property_pixbuf() = pixbuf;
 }
 
+double Flame::get_max_value()
+{
+  return max;
+}
+
 
 //
 // class FlameView
@@ -339,6 +344,17 @@ void FlameView::do_detach(Monitor *monitor)
 
 void FlameView::do_draw_loop()
 {
+  double max = 0;
+
+  /* Obtain maximum value of all flames in the view, ignoring any monitors with
+   * fixed maxes (their visualisations are not supposed to be scaled) */
+  for (flame_iterator i = flames.begin(), end = flames.end(); i != end; ++i)
+  {
+

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 22/29: CurveView: Treat Curves for different monitor types as separate synced sources, so independent maxes

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 0700a56d8349aea70a71a0d2f347d7960cd09105
Author: OmegaPhil 
Date:   Sun Dec 10 20:24:49 2017 +

CurveView: Treat Curves for different monitor types as separate synced 
sources, so independent maxes
---
 src/canvas-view.hpp |   5 ++
 src/curve-view.cpp  | 221 +++-
 src/curve-view.hpp  |   6 +-
 3 files changed, 160 insertions(+), 72 deletions(-)

diff --git a/src/canvas-view.hpp b/src/canvas-view.hpp
index 9bc2848..c6e4021 100644
--- a/src/canvas-view.hpp
+++ b/src/canvas-view.hpp
@@ -55,6 +55,11 @@ protected:
 
   int size; // in pixels, width when vertical, else height
 
+  /* Used to locate monitor type of interest in monitor_maxes during
+   * visualisation draw loop */
+  typedef std::map>::iterator
+  mon_type_iterator;
+
   std::auto_ptr canvas;
 
   sigc::connection draw_timer;
diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index 50dd1f6..3f4b74b 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -17,7 +17,10 @@
  * along with this program; if not, see .
  */
 
-#include // for max/min[_element]()
+#include   // For max/min[_element]()
+#include 
+#include   // For keeping track of monitor types in the visualisation
+#include   // For keeping track of monitor types in the visualisation
 
 #include 
 #include 
@@ -267,29 +270,74 @@ void CurveView::do_detach(Monitor *monitor)
 
 void CurveView::do_draw_loop()
 {
-  double max = 0, fixed_max = 0;
+  double max;
+
+  // Monitor maxes maintained as a pair of , 
+  std::map> monitor_maxes;
+
+  // Monitors collected by type to allow easy access to separated data sets
+  std::map> curves_by_mon_type;
+
   Glib::ustring max_formatted, max_formatted_compact, monitor_data,
-  monitor_data_compact, text_overlay_format_string, tag_string,
+  monitor_data_compact, overlay_text, per_type_overlay_text,
+  text_overlay_format_string, tag_string,
   separator_string = plugin->get_viewer_text_overlay_separator();
   bool graph_max_needed = false, graph_max_compact_needed = false,
   monitor_data_needed = false, monitor_data_compact_needed = false,
   text_overlay_enabled = plugin->get_viewer_text_overlay_enabled();
 
-  /* Obtain maximum value of all curves in the view, separately tracking fixed
-   * maxes incase all monitors are fixed. Graphs with fixed monitors are not
-   * supposed to be scaled, but the text overlay still needs to refer to a max
-   * if there are no normal monitors present */
+  /* Obtain maximum value of all curves in the view on a per monitor type 
basis,
+   * separately tracking fixed maxes incase all monitors are fixed. Graphs with
+   * fixed monitors are not supposed to be scaled, but the text overlay still
+   * needs to refer to a max if there are no normal monitors present
+   * Priority-wise, non-fixed monitor sources are always reported in preference
+   * to fixed-max sources
+   * On top of this, collect the curves together by monitor type so that they
+   * can be looped over later - easy to do this here while I'm already looping
+   * over everything, rather than maintaining a separate list on
+   * attaching/detaching monitors
+   * Unified maxes are needed even if the text overlay is not enabled */
+  mon_type_iterator it;
+  curves_mon_type_iterator it_mon_type;
+  Glib::ustring mon_type;
   for (curve_iterator i = curves.begin(), end = curves.end(); i != end; ++i)
   {
-if (!(*i)->monitor->fixed_max() && (*i)->get_max_value() > max)
-  max = (*i)->get_max_value();
-else if ((*i)->monitor->fixed_max() && (*i)->monitor->max() > fixed_max)
-  fixed_max = (*i)->monitor->max();
+// To get the real type, Monitor* must be dereferrenced too...
+mon_type = typeid(*((*i)->monitor)).name();
+
+// If the monitor type hasn't yet been recorded, zero the maxes
+it = monitor_maxes.find(mon_type);
+if (it == monitor_maxes.end())
+  monitor_maxes[mon_type] = std::make_pair(0, 0);
+
+if (!(*i)->monitor->fixed_max()
+&& (*i)->get_max_value() > monitor_maxes[mon_type].first)
+  monitor_maxes[mon_type].first = (*i)->get_max_value();
+else if ((*i)->monitor->fixed_max()
+ && (*i)->monitor->max() > monitor_maxes[mon_type].second)
+  monitor_maxes[mon_type].second = (*i)->monitor->max();
+
+// Record curve in monitor type list
+it_mon_type = curves_by_mon_type.find(mon_type);
+if (it_mon_type == curves_by_mon_type.end())
+  curves_by_mon_type[mon_type] = std::list();
+curves_by_mon_type[mon_type].push_back(*i);
+  }
+
+  /* If a visualisation monitor type only has fixed maxes, then make sure the
+   * max value used i

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 16/29: Minor comments update, comment out debug code

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 9cf84a59c731a153e11fcd344efe696a395391d9
Author: OmegaPhil 
Date:   Tue Nov 28 20:11:48 2017 +

Minor comments update, comment out debug code
---
 src/monitor-impls.cpp | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index aaea7eb..a319f1b 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -38,15 +38,16 @@
 #include 
 #include 
 
-#include// for high-precision timing for the network load
+#include   // For high-precision timing for network load and disk
+   // read/write speed
 
 #include "monitor-impls.hpp"
 #include "ucompose.hpp"
 #include "i18n.hpp"
 
 /* Decay factor for maximum values (log_0.999(0.9) = 105 iterations
- * before reduced 10%). This is now no longer used for CurveView - the
- * actual max value across the ValueHistories is used */
+ * before reduced 10%). This is now no longer used for CurveView or ColumnView 
-
+ * the actual max value across the ValueHistories is used */
 double const max_decay = 0.999;
 
 
@@ -419,7 +420,7 @@ Glib::ustring format_bytes_per_second(long duration_ms, 
double bytes,
   double val = bytes / duration_ms * 1000;
 
   // Debug code
-  std::cerr << String::ucompose("format_bytes_per_second formatting %1\n", 
val);
+  //std::cerr << String::ucompose("format_bytes_per_second formatting %1\n", 
val);
 
   if (val <= 0) // fix weird problem with negative values
 val = 0;
@@ -1067,9 +1068,9 @@ double DiskStatsMonitor::do_measure()
   }
 
   // Debug code
-  std::cerr << Glib::ustring::compose("Device '%1' stat %2: %3\n", device_name,
+  /*std::cerr << Glib::ustring::compose("Device '%1' stat %2: %3\n", 
device_name,
   stat_to_string(stat_to_monitor, false),
-  it->second[stat_to_monitor]);
+  it->second[stat_to_monitor]);*/
 
   double val;
   if (convert_to_rate())
@@ -1099,10 +1100,10 @@ double DiskStatsMonitor::do_measure()
   }
 
   // Debug code
-  std::cerr << Glib::ustring::compose("Device '%1' has filesystem block 
size"
+  /*std::cerr << Glib::ustring::compose("Device '%1' has filesystem block 
size"
   " %2, measurement time difference 
%3\n",
   device_name, multiplication_factor,
-  time_difference);
+  time_difference);*/
 }
 else
   multiplication_factor = 1;

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 19/29: Implement proper debug logging function when needed

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit c2e9777a8e5265f06ed3423c3bfc669661fe91af
Author: OmegaPhil 
Date:   Sat Dec 9 14:06:52 2017 +

Implement proper debug logging function when needed
---
 src/choose-monitor-window.cpp |  46 --
 src/choose-monitor-window.hpp |   4 +-
 src/monitor-impls.cpp | 142 +-
 src/monitor-impls.hpp |  25 
 src/monitor.hpp   |  16 +++--
 src/plugin.cpp|  35 ++-
 src/plugin.hpp|   8 +++
 src/preferences-window.cpp|   2 +-
 8 files changed, 195 insertions(+), 83 deletions(-)

diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index 57f9f52..42b7e4e 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -28,15 +28,15 @@
 #include "choose-monitor-window.hpp"
 #include "gui-helpers.hpp"
 #include "monitor-impls.hpp"
+#include "plugin.hpp"
 #include "ucompose.hpp"
 
 
 // Static intialisation
 ChooseMonitorWindow::NetworkInterfacesNamesCols ChooseMonitorWindow::nc;
 
-ChooseMonitorWindow::ChooseMonitorWindow(XfcePanelPlugin* xfce_plugin,
- Gtk::Window &parent)
-  : xfce_plugin(xfce_plugin)
+ChooseMonitorWindow::ChooseMonitorWindow(Plugin& plugin, Gtk::Window &parent)
+  : plugin_priv(plugin)
 {
   // Now we are forced to use top-level widgets this is much more over the 
top...
   std::vector objects(22);
@@ -414,7 +414,7 @@ ChooseMonitorWindow::ChooseMonitorWindow(XfcePanelPlugin* 
xfce_plugin,
   (*iter)[nc.interface_type] = NetworkLoadMonitor::
   interface_type_to_string(interface_type, false);
   (*iter)[nc.interface_name] = NetworkLoadMonitor::
-  get_interface_name(interface_type, xfce_plugin);
+  get_interface_name(interface_type, plugin_priv.xfce_plugin);
   }
 
   // Setup network direction combobox
@@ -539,7 +539,7 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 {
   // Set up monitor
   // Search for settings file
-  gchar* file = xfce_panel_plugin_lookup_rc_file(xfce_plugin);
+  gchar* file = xfce_panel_plugin_lookup_rc_file(plugin_priv.xfce_plugin);
   if (file)
   {
 // Loading settings
@@ -666,6 +666,12 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 bool fixed_max = xfce_rc_read_bool_entry(settings_ro, "fixed_max", 
false);
 disk_stats_fixed_max_checkbutton->set_active(fixed_max);
 disk_stats_max_spinbutton->set_value(max);
+
+// Debug code
+/*plugin_priv.debug_log(
+  String::ucompose("XFCE4 Hardware Monitor Plugin: "
+ "ChooseMonitorWindow::run, disk stats monitor max 
"
+ "value: %1", max));*/
   }
   else if (type == "swap_usage")
   {
@@ -789,6 +795,10 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 bool fixed_max = xfce_rc_read_bool_entry(settings_ro, "fixed_max", 
false);
 network_load_fixed_max_checkbutton->set_active(fixed_max);
 network_load_max_spinbutton->set_value(max);
+
+// Debug code
+/*std::cerr << "XFCE4 Hardware Monitor Plugin: 
ChooseMonitorWindow::run, "
+ "network load monitor max value: " << max << "\n";*/
   }
   else if (type == "temperature")
   {
@@ -936,28 +946,28 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000),
 cpu_usage_incl_low_checkbutton->get_active(),
 cpu_usage_incl_iowait_checkbutton->get_active(),
-cpu_tag->get_text());
+cpu_tag->get_text(), plugin_priv);
 else
   mon = new CpuUsageMonitor(
 cpu_usage_fixed_max_checkbutton->get_active(),
 int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000),
 cpu_usage_incl_low_checkbutton->get_active(),
 cpu_usage_incl_iowait_checkbutton->get_active(),
-cpu_tag->get_text());
+cpu_tag->get_text(), plugin_priv);
   }
   else if (memory_usage_radiobutton->get_active())
   {
 mon = new MemoryUsageMonitor(
   int(memory_refresh_delay_spinbutton->get_value() * 1000),
   memory_fixed_max_checkbutton->get_active(),
-  memory_usage_tag->get_text());
+  memory_usage_tag->get_text(), plugin_priv);
   }
   else if (swap_usage_radiobutton->get_active())
   {
 mon = new SwapUsageMonitor(
   int(swap_refresh_delay_spinbutton->get_value() * 1000),
   swap_

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 17/29: SwapUsageMonitor no longer has a user-configurable max, so dont save it

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 88df30674b999098eb2ffe56bf78108e3248ec86
Author: OmegaPhil 
Date:   Tue Nov 28 20:24:39 2017 +

SwapUsageMonitor no longer has a user-configurable max, so dont save it
---
 src/monitor-impls.cpp | 5 -
 1 file changed, 5 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index a319f1b..398e869 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -657,11 +657,6 @@ void SwapUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "type", "swap_usage");
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
   xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
-
-  // No support for floats - stringifying
-  Glib::ustring setting = String::ucompose("%1", max_value);
-  xfce_rc_write_entry(settings_w, "max", setting.c_str());
-
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 20/29: Only save max if user-set fixed max is in use

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 898a38e77f39734a118a8b45c3b757be31e568d2
Author: OmegaPhil 
Date:   Sat Dec 9 14:09:01 2017 +

Only save max if user-set fixed max is in use
---
 src/monitor-impls.cpp | 83 ---
 1 file changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index 237204d..7e93345 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -652,7 +652,7 @@ void CpuUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_bool_entry(settings_w, "include_iowait",
incl_iowait_priv);
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
+  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
@@ -740,7 +740,7 @@ void SwapUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_set_group(settings_w, dir.c_str());
   xfce_rc_write_entry(settings_w, "type", "swap_usage");
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
+  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
@@ -835,11 +835,17 @@ void LoadAverageMonitor::save(XfceRc *settings_w)
   xfce_rc_set_group(settings_w, dir.c_str());
   xfce_rc_write_entry(settings_w, "type", "load_average");
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
 
-  // No support for floats - stringifying
-  Glib::ustring setting = String::ucompose("%1", max_value);
-  xfce_rc_write_entry(settings_w, "max", setting.c_str());
+  /* Only save the max if it is a user-set fixed max, otherwise effectively
+   * reset it
+   * No support for floats - stringifying */
+  if (fixed_max_priv)
+  {
+Glib::ustring setting = String::ucompose("%1", max_value);
+xfce_rc_write_entry(settings_w, "max", setting.c_str());
+  }
+  else
+xfce_rc_write_entry(settings_w, "max", "0");
 
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
@@ -931,7 +937,7 @@ void MemoryUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_set_group(settings_w, dir.c_str());
   xfce_rc_write_entry(settings_w, "type", "memory_usage");
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
+  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
@@ -1044,7 +1050,7 @@ void DiskUsageMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "mount_dir", mount_dir.c_str());
   xfce_rc_write_bool_entry(settings_w, "show_free", show_free);
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
+  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 }
 
@@ -1366,8 +1372,12 @@ void DiskStatsMonitor::save(XfceRc *settings_w)
   xfce_rc_write_entry(settings_w, "type", "disk_statistics");
   xfce_rc_write_entry(settings_w, "disk_stats_device", device_name.c_str());
   xfce_rc_write_int_entry(settings_w, "disk_stats_stat", int(stat_to_monitor));
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
-  xfce_rc_write_int_entry(settings_w, "max", int(max_value));
+  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
+
+  /* Only save the max if it is a user-set fixed max, otherwise effectively
+   * reset it */
+  xfce_rc_write_int_entry(settings_w, "max", fixed_max_priv ? int(max_value) : 
0);
+
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
   xfce_rc_write_entry(settings_w, "tag", tag.c_str());
 
@@ -2028,8 +2038,12 @@ void NetworkLoadMonitor::save(XfceRc *settings_w)
   xfce_rc_write_int_entry(settings_w, "interface_type", int(interface_type));
   xfce_rc_write_int_entry(settings_w, "interface_direction",
 int(direction));
-  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max());
-  xfce_rc_write_int_entry(settings_w, "max", int(max_value));
+  xfce_rc_write_bool_entry(settings_w, "fixed_max", fixed_max_priv);
+
+  /* Only save the max if it is a user-set fixed max, otherwise effectively
+   * reset it */
+  xfce_rc_write_int_entry(settings_w, "max", fixed_max_priv ? int(max_value) : 
0);
+
   xfce_rc_write_int_entry(settings_w, "update_interval", update_interval());
   xfce_rc_wr

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 18/29: Update unit reporting to reflect the fact its no longer always seconds, make all DiskStats durations precise

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 7843210061951a7fb0a3d2beb8c59dd9cbd7231f
Author: OmegaPhil 
Date:   Sat Dec 2 14:43:00 2017 +

Update unit reporting to reflect the fact its no longer always seconds, 
make all DiskStats durations precise
---
 src/monitor-impls.cpp | 137 +++---
 1 file changed, 96 insertions(+), 41 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index 398e869..49c6a9a 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -411,39 +411,89 @@ Precision decimal_digits(double val, int n)
   return p;
 }
 
-Glib::ustring format_bytes_per_second(long duration_ms, double bytes,
-  bool compact)
+Glib::ustring format_duration_to_string(long duration)
+{
+  /* This is intended to summarise a user-customisable time period for long
+   * monitor descriptions, breaking millisecond duration into hours, minutes,
+   * seconds */
+  int hours = 0, minutes = 0, seconds = 0;
+  Glib::ustring duration_string("");
+
+  if (duration >= 360)
+  {
+hours = duration / 360;
+duration -= (hours * 360);
+duration_string += String::ucompose(_("%1h"), hours);
+  }
+  if (duration >= 6)
+  {
+minutes = duration / 6;
+duration -= (minutes * 6);
+duration_string += String::ucompose(_("%1m"), minutes);
+  }
+  if (duration >= 1000)
+  {
+seconds = duration / 1000;
+duration_string += String::ucompose(_("%1s"), seconds);
+  }
+
+  /* When a single unit of a single time period is returned, don't return the
+   * number */
+  if (hours + minutes + seconds == 1)
+  {
+if (hours == 1)
+  return "h";
+else if (minutes == 1)
+  return "m";
+else
+  return "s";
+  }
+  else
+return duration_string;
+}
+
+Glib::ustring format_bytes_per_duration(long duration, int expected_duration,
+double bytes, bool compact)
 {
   Glib::ustring format;
 
-  // 1000 ms = 1 s
-  double val = bytes / duration_ms * 1000;
+  /* Values are in milliseconds - this creates an average rate over the actual
+   * time duration measured, scaled to the precise desired duration - otherwise
+   * the timer tick is slightly inaccurate (so 1ms late for a second etc) */
+  double val = bytes / duration * expected_duration;
 
   // Debug code
-  //std::cerr << String::ucompose("format_bytes_per_second formatting %1\n", 
val);
+  //std::cerr << String::ucompose("format_bytes_per_duration formatting %1\n", 
val);
 
   if (val <= 0) // fix weird problem with negative values
 val = 0;
 
-  if (val >= 1024 * 1024 * 1024) {
+  if (val >= 1024 * 1024 * 1024)
+  {
 val /= 1024 * 1024 * 1024;
-format = compact ? _("%1G") : _("%1 GB/s");
-return String::ucompose(format, decimal_digits(val, 3), val);
+format = compact ? _("%1G%2") : "%1 GB/%2";
+return String::ucompose(format, decimal_digits(val, 3), val,
+   compact ? "" : 
format_duration_to_string(expected_duration));
   }
-  else if (val >= 1024 * 1024) {
+  else if (val >= 1024 * 1024)
+  {
 val /= 1024 * 1024;
-format = compact ? _("%1M") : _("%1 MB/s");
-return String::ucompose(format, decimal_digits(val, 3), val);
+format = compact ? _("%1M%2") : "%1 MB/%2";
+return String::ucompose(format, decimal_digits(val, 3), val,
+   compact ? "" : 
format_duration_to_string(expected_duration));
   }
-  else if (val >= 1024) {
+  else if (val >= 1024)
+  {
 val /= 1024;
-format = compact ? _("%1K") : _("%1 KB/s");
-return String::ucompose(format, decimal_digits(val, 3), val);
+format = compact ? _("%1K%2") : "%1 KB/%2";
+return String::ucompose(format, decimal_digits(val, 3), val,
+   compact ? "" : 
format_duration_to_string(expected_duration));
   }
   else
   {
-format = compact ? _("%1B") : _("%1 B/s");
-return String::ucompose(format, decimal_digits(val, 3), val);
+format = compact ? _("%1B%2") : "%1 B/%2";
+return String::ucompose(format, decimal_digits(val, 3), val,
+   compact ? "" : 
format_duration_to_string(expected_duration));
   }
 }
 
@@ -1070,30 +1120,15 @@ double DiskStatsMonitor::do_measure()
   double val;
   if (convert_to_rate())
   {
-/* Sectors read and written are now converted to bytes based off the
- * relevant device's sector size, allowing for the much more interesting
- * data rate to be reported on
- * Conversion to bytes is left to here so as not to call fsuage on all
- * volumes pointlessly
- * Time of call used to get at a precise data rate, like the network load
- * monitor does */
+/* Sectors read and wri

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 13/29: Move advanced network interfaces setup

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 3378279d4732b60ae3792de30cab9a9f64ea788d
Author: OmegaPhil 
Date:   Sat Nov 25 11:42:24 2017 +

Move advanced network interfaces setup

Move the advanced network interfaces setup into the choose monitor
dialog instantiation, so that its ready immediately when someone
wants to configure their network monitor
---
 src/choose-monitor-window.cpp | 68 +++
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index 4c925cf..5a76bb6 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -383,6 +383,40 @@ ChooseMonitorWindow::ChooseMonitorWindow(XfcePanelPlugin* 
xfce_plugin,
   interface_type_to_string(interface_type, false);
   }
 
+  /* Populate interface type interface names advanced settings - interface
+   * name column needs to be editable + trigger validation on entry - note
+   * that append_column returns the number of columns present rather than
+   * the genuine ordinal to the last column, hence -1
+   * Advanced interface-naming is per-plugin and saved in the global plugin
+   * settings - its not reliant on a network monitor being selected and/or
+   * saved etc, and should be available when the user is browsing through
+   * the monitor types */
+  network_interfaces_names_store = Gtk::ListStore::create(nc);
+  network_interfaces_treeview->set_model(network_interfaces_names_store);
+  network_interfaces_treeview->append_column(_("Interface Type"),
+ nc.interface_type);
+  int column_num = network_interfaces_treeview
+  ->append_column(_("Interface Name"), nc.interface_name) - 1;
+
+  // Documentation asks for dynamic_cast here
+  Gtk::CellRendererText *cell_renderer = 
dynamic_cast(network_interfaces_treeview
+  ->get_column_cell_renderer(column_num));
+  cell_renderer->property_editable() = true;
+  cell_renderer->signal_edited().connect(
+sigc::mem_fun(*this, &ChooseMonitorWindow::
+  on_network_interface_name_edited));
+
+  for (int i = 0; i < NetworkLoadMonitor::NUM_INTERFACE_TYPES; ++i)
+  {
+  NetworkLoadMonitor::InterfaceType interface_type =
+  static_cast(i);
+  store_iter iter = network_interfaces_names_store->append();
+  (*iter)[nc.interface_type] = NetworkLoadMonitor::
+  interface_type_to_string(interface_type, false);
+  (*iter)[nc.interface_name] = NetworkLoadMonitor::
+  get_interface_name(interface_type, xfce_plugin);
+  }
+
   // Setup network direction combobox
   static NetworkDirectionCols ndc;
   network_direction_store = Gtk::ListStore::create(ndc);
@@ -743,38 +777,8 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 break;
 }
 
-/* Populate interface type interface names advanced settings - 
interface
- * name column needs to be editable + trigger validation on entry - 
note
- * that append_column returns the number of columns present rather than
- * the genuine ordinal to the last column, hence -1
- * This is here as it is independent of monitors but dependent on a 
settings
- * file being available, and needs to run both when a monitor does and 
doesn't
- * exist */
-network_interfaces_names_store = Gtk::ListStore::create(nc);
-network_interfaces_treeview->set_model(network_interfaces_names_store);
-network_interfaces_treeview->append_column(_("Interface Type"),
-   nc.interface_type);
-int column_num = network_interfaces_treeview
-->append_column(_("Interface Name"), nc.interface_name) - 1;
-
-// Documentation asks for dynamic_cast here
-Gtk::CellRendererText *cell_renderer = 
dynamic_cast(network_interfaces_treeview
-
->get_column_cell_renderer(column_num));
-cell_renderer->property_editable() = true;
-cell_renderer->signal_edited().connect(
-  sigc::mem_fun(*this, &ChooseMonitorWindow::
-on_network_interface_name_edited));
-
-for (int i = 0; i < NetworkLoadMonitor::NUM_INTERFACE_TYPES; ++i)
-{
-NetworkLoadMonitor::InterfaceType interface_type =
-static_cast(i);
-store_iter iter = network_interfaces_names_store->append();
-(*iter)[nc.interface_type] = NetworkLoadMonitor::
-interface_type_to_string(interface_type, false);
-(*iter)[nc.interface_name] = NetworkLoadMonito

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 15/29: Remove old WIP

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 5eb7bdb78858a421edc2268a156dd584a5305f07
Author: OmegaPhil 
Date:   Tue Nov 28 19:36:06 2017 +

Remove old WIP
---
 src/choose-monitor-window.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index 5a76bb6..57f9f52 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -678,7 +678,6 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
   update_interval = SwapUsageMonitor::update_interval_default;
 swap_refresh_delay_spinbutton->set_value(update_interval / 1000);
 
-// WIP: Why is this not max by default?
 bool fixed_max = xfce_rc_read_bool_entry(settings_ro, "fixed_max", 
true);
 swap_fixed_max_checkbutton->set_active(fixed_max);
   }

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 11/29: Actually respect fixed maxes when doing measurements

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit fee2f1c5b2f52e35f09c19f48e90c328a47c4678
Author: OmegaPhil 
Date:   Fri Nov 24 21:12:13 2017 +

Actually respect fixed maxes when doing measurements
---
 src/monitor-impls.cpp | 87 ---
 1 file changed, 54 insertions(+), 33 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index bbc2c0f..85f5878 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -570,12 +570,14 @@ double SwapUsageMonitor::do_measure()
 
   glibtop_get_swap(&swp);
 
+  // User-specified max is not allowed here, so this is fine
   max_value = swp.total;
 
   if (swp.total > 0)
 return swp.used;
   else
 return 0;
+
 }
 
 bool SwapUsageMonitor::fixed_max()
@@ -661,13 +663,17 @@ double LoadAverageMonitor::do_measure()
 
   double val = loadavg.loadavg[0];
 
-  max_value *= max_decay; // reduce gradually
+  // Only alter max_value if the monitor doesn't have a user-specified fixed 
max
+  if (!fixed_max_priv)
+  {
+max_value *= max_decay; // reduce gradually
 
-  if (max_value < 1)// make sure we don't get below 1
-max_value = 1;
+if (max_value < 1)// make sure we don't get below 1
+  max_value = 1;
 
-  if (val > max_value)
-max_value = val * 1.05;
+if (val > max_value)
+  max_value = val * 1.05;
+  }
 
   if (max_value > 0)
 return val;
@@ -758,6 +764,7 @@ double MemoryUsageMonitor::do_measure()
 
   glibtop_get_mem (&mem);
 
+  // User-specified max is not allowed here, so this is fine
   max_value = mem.total;
 
   if (mem.total > 0)
@@ -844,7 +851,7 @@ double DiskUsageMonitor::do_measure()
 
   glibtop_get_fsusage(&fsusage, mount_dir.c_str());
 
-  // Keeping max_value available whether the monitor has a fixed max or not
+  // User-specified fixed max is not allowed here, so this is fine
   max_value = fsusage.blocks * fsusage.block_size;
 
   double v = 0;
@@ -1041,13 +1048,17 @@ double DiskStatsMonitor::do_measure()
 val = it->second[stat_to_monitor];
   }
 
-  /* Note - max_value is no longer used to determine the graph max for
-   * Curves - the actual maxima stored in the ValueHistories are used */
-  if (val != 0) // Reduce scale gradually
-max_value = guint64(max_value * max_decay);
+  // Only altering the max_value if there is no user-specified fixed max
+  if (!fixed_max_priv)
+  {
+/* Note - max_value is no longer used to determine the graph max for
+ * Curves - the actual maxima stored in the ValueHistories are used */
+if (val != 0) // Reduce scale gradually
+  max_value = guint64(max_value * max_decay);
 
-  if (val > max_value)
-max_value = guint64(val * 1.05);
+if (val > max_value)
+  max_value = guint64(val * 1.05);
+  }
 
   // Debug code
   //std::cerr << "Returning value: " << val << "\n";
@@ -1593,21 +1604,25 @@ double NetworkLoadMonitor::do_measure()
 
   byte_count = measured_bytes;
 
-  /* Note - max_value is no longer used to determine the graph max for
+  // Only altering max_value if there is no user-specified max
+  if (!fixed_max_priv)
+  {
+/* Note - max_value is no longer used to determine the graph max for
* Curves - the actual maxima stored in the ValueHistories are used */
-  if (val != 0) // Reduce scale gradually
-max_value = guint64(max_value * max_decay);
-
-  if (val > max_value)
-max_value = guint64(val * 1.05);
-
-  for (nlm_seq::iterator i = sync_monitors.begin(), end = sync_monitors.end();
-   i != end; ++i) {
-NetworkLoadMonitor &other = **i;
-if (other.max_value > max_value)
-  max_value = other.max_value;
-else if (max_value > other.max_value)
-  other.max_value = max_value;
+if (val != 0) // Reduce scale gradually
+  max_value = guint64(max_value * max_decay);
+
+if (val > max_value)
+  max_value = guint64(val * 1.05);
+
+for (nlm_seq::iterator i = sync_monitors.begin(), end = 
sync_monitors.end();
+ i != end; ++i) {
+  NetworkLoadMonitor &other = **i;
+  if (other.max_value > max_value)
+max_value = other.max_value;
+  else if (max_value > other.max_value)
+other.max_value = max_value;
+}
   }
 
   // calculate difference in msecs
@@ -2074,7 +2089,8 @@ double TemperatureMonitor::do_measure()
 {
   double val = Sensors::instance().get_value(chip_no, feature_no);
 
-  if (val > max_value)
+  // Only altering max_value if there is no user-specified max
+  if (!fixed_max_priv && val > max_value)
 max_value = val;
 
   return val;
@@ -2180,7 +2196,8 @@ double FanSpeedMonitor::do_measure()
 {
   double val = Sensors::instance().get_value(chip_no, feature_no);
 
-  if (val > max_value)
+  // Only altering

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 04/29: Allow to configure which CPU time is counted for CPU usage monitor

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 5b8d4f931580ce446d6b05ad956b5d33f6192f26
Author: OmegaPhil 
Date:   Sun Nov 19 15:50:34 2017 +

Allow to configure which CPU time is counted for CPU usage monitor

As mentioned in #13910 / https://bugzilla.xfce.org/show_bug.cgi?id=13910
the CPU usage monitor has always dropped low priority CPU time in
order to avoid SETI@home CPU usage swamping out anything else. This
is now configurable - the user can now choose to include low priority
CPU time and IO wait
---
 src/choose-monitor-window.cpp |  22 -
 src/choose-monitor-window.hpp |   3 +-
 src/monitor-impls.cpp |  49 +++---
 src/monitor-impls.hpp |   9 +-
 src/ui.glade  | 216 ++
 5 files changed, 198 insertions(+), 101 deletions(-)

diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index bc76a08..2e97e02 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -66,6 +66,10 @@ ChooseMonitorWindow::ChooseMonitorWindow(XfcePanelPlugin* 
xfce_plugin,
   ui->get_widget("all_cpus_radiobutton", all_cpus_radiobutton);
   ui->get_widget("one_cpu_radiobutton", one_cpu_radiobutton);
   ui->get_widget("cpu_no_spinbutton", cpu_no_spinbutton);
+  ui->get_widget("cpu_usage_incl_low_checkbutton",
+ cpu_usage_incl_low_checkbutton);
+  ui->get_widget("cpu_usage_incl_iowait_checkbutton",
+ cpu_usage_incl_iowait_checkbutton);
   ui->get_widget("cpu_usage_tag_entry", cpu_tag);
   ui->get_widget("cpu_usage_refresh_delay_spinbutton",
  cpu_usage_refresh_delay_spinbutton);
@@ -271,6 +275,9 @@ ChooseMonitorWindow::ChooseMonitorWindow(XfcePanelPlugin* 
xfce_plugin,
   // Note 1 off to avoid counting from zero in the interface
   cpu_no_spinbutton->set_range(1, CpuUsageMonitor::max_no_cpus);
 
+  cpu_usage_incl_low_checkbutton->set_active(false);
+  cpu_usage_incl_iowait_checkbutton->set_active(false);
+
   /* While I have set the defaults in the ui.glade Adjustment.Values, best to
* maintain it here */
   cpu_usage_refresh_delay_spinbutton->set_value(
@@ -579,6 +586,13 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 else {
   all_cpus_radiobutton->set_active();
 }
+
+bool incl_low_prio = xfce_rc_read_bool_entry(settings_ro,
+  "include_low_priority", false);
+cpu_usage_incl_low_checkbutton->set_active(incl_low_prio);
+bool incl_iowait = xfce_rc_read_bool_entry(settings_ro,
+  "include_iowait", false);
+cpu_usage_incl_iowait_checkbutton->set_active(incl_iowait);
   }
 
   // Fill in disk usage info
@@ -853,11 +867,15 @@ Monitor *ChooseMonitorWindow::run(const Glib::ustring 
&mon_dir)
 if (one_cpu_radiobutton->get_active())
   mon = new CpuUsageMonitor(
 int(cpu_no_spinbutton->get_value()) - 1, cpu_tag->get_text(),
-int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000));
+int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000),
+cpu_usage_incl_low_checkbutton->get_active(),
+cpu_usage_incl_iowait_checkbutton->get_active());
 else
   mon = new CpuUsageMonitor(
 cpu_tag->get_text(),
-int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000));
+int(cpu_usage_refresh_delay_spinbutton->get_value() * 1000),
+cpu_usage_incl_low_checkbutton->get_active(),
+cpu_usage_incl_iowait_checkbutton->get_active());
   }
   else if (memory_usage_radiobutton->get_active())
   {
diff --git a/src/choose-monitor-window.hpp b/src/choose-monitor-window.hpp
index 6506da3..ec5b39f 100644
--- a/src/choose-monitor-window.hpp
+++ b/src/choose-monitor-window.hpp
@@ -92,7 +92,8 @@ private:
*swap_usage_options;
   Gtk::Entry *mount_dir_entry, *disk_usage_tag, *disk_stats_tag, 
*memory_usage_tag,
  *swap_usage_tag;
-  Gtk::CheckButton *show_free_checkbutton;
+  Gtk::CheckButton *show_free_checkbutton, *cpu_usage_incl_low_checkbutton,
+   *cpu_usage_incl_iowait_checkbutton;
 
   Gtk::ComboBox *disk_stats_device_combobox, *disk_stats_stat_combobox;
 
diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index c9ddec4..db8d897 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -91,11 +91,22 @@ load_monitors(XfceRc *settings_ro, XfcePanelPlugin 
*panel_plugin)
 if (update_interval == -1)
   update_interval = CpuUsageMonitor::update_interval_default;
 
+bool incl_low_prio = xfce_rc_read_bool_entry(settings_ro,
+

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 10/29: Fix storage of adjustment widgets

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit d794d23f23ee8e4c6345614c705845bd48a375e2
Author: OmegaPhil 
Date:   Fri Nov 24 20:38:52 2017 +

Fix storage of adjustment widgets
---
 src/choose-monitor-window.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/choose-monitor-window.cpp b/src/choose-monitor-window.cpp
index 94112bb..4c925cf 100644
--- a/src/choose-monitor-window.cpp
+++ b/src/choose-monitor-window.cpp
@@ -55,11 +55,11 @@ ChooseMonitorWindow::ChooseMonitorWindow(XfcePanelPlugin* 
xfce_plugin,
   objects[12] = "memory_refresh_delay_adjustment";
   objects[13] = "memory_max_adjustment";
   objects[14] = "network_load_delay_adjustment";
-  objects[15] = "network_load_max_spinbutton";
+  objects[15] = "network_load_max_adjustment";
   objects[16] = "temperature_delay_adjustment";
-  objects[17] = "temperature_max_spinbutton";
+  objects[17] = "temperature_max_adjustment";
   objects[18] = "fan_delay_adjustment";
-  objects[19] = "fan_max_spinbutton";
+  objects[19] = "fan_max_adjustment";
   objects[20] = "generic_delay_adjustment";
   objects[21] = "generic_max_adjustment";
   ui = get_builder_xml(objects);

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 12/29: Column visualisation maxes from value history, fixed max monitors excluded from max calculations

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 4f9d1af74bbd03417115f9b8e0ac6e5d5c91317d
Author: OmegaPhil 
Date:   Fri Nov 24 21:58:26 2017 +

Column visualisation maxes from value history, fixed max monitors excluded 
from max calculations
---
 src/column-view.cpp | 60 +++--
 src/curve-view.cpp  | 26 +++
 src/ui.glade| 49 +++
 3 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/src/column-view.cpp b/src/column-view.cpp
index 241f0fc..86999fe 100644
--- a/src/column-view.cpp
+++ b/src/column-view.cpp
@@ -38,14 +38,15 @@ class ColumnGraph
 public:
   ColumnGraph(Monitor *monitor, unsigned int color);
 
-  void update(unsigned int max_samples); // gather info from monitor
-  void draw(Gnome::Canvas::Canvas &canvas, // redraw columns on canvas
-  Plugin *plugin, int width, int height);
+  void update(unsigned int max_samples);  // Gather info from monitor
+  void draw(Gnome::Canvas::Canvas &canvas,  // Redraw columns on canvas
+  Plugin *plugin, int width, int height, double max);
+  double get_max_value();  // Used to get overall max across columns
 
   Monitor *monitor;
   
 private:
-  // a pixbuf is used for the columns
+  // A pixbuf is used for the columns
   std::auto_ptr columns;
 
   ValueHistory value_history;
@@ -67,8 +68,8 @@ void ColumnGraph::update(unsigned int max_samples)
 remaining_draws = CanvasView::draw_iterations;
 }
 
-void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
-   Plugin *plugin, int width, int height)
+void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas, Plugin *plugin, int 
width,
+   int height, double max)
 {
   if (remaining_draws <= 0)
 return;
@@ -80,15 +81,17 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
   ValueHistory::iterator vi = value_history.values.begin(),
 vend = value_history.values.end();
 
-  if (vi == vend)   // there must be at least one point
+  // There must be at least one point
+  if (vi == vend)
 return;
 
-  // make sure we got a pixbuf and that it has the right size
+  // Make sure we got a pixbuf and that it has the right size
   Glib::RefPtr pixbuf;
 
   if (columns.get() == 0)
 pixbuf = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, width, height);
-  else {
+  else
+  {
 pixbuf = columns->property_pixbuf();
 
 // but perhaps the dimensions have changed
@@ -98,11 +101,17 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
 
   pixbuf->fill(color & 0xFF00);
   
-  double max = monitor->max();
+  /* Use the actual maxima associated with all columns in the view, unless
+   * the monitor has a fixed max (variable maxes should not normally be used
+   * with monitors like the CPU usage monitor, although the user can configure
+   * this nowadays) */
+  if (monitor->fixed_max())
+  max = monitor->max();
+
   if (max <= 0)
 max = 0.001;
 
-  // start from right
+  // Start from right
   double l = width - ColumnView::pixels_per_sample
 + ColumnView::pixels_per_sample * time_offset;
 
@@ -121,7 +130,7 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
   {
 PixelPosition pos = get_position(pixbuf, x, t);
 
-// anti-aliasing effect; if we are partly on a pixel, scale alpha down
+// Anti-aliasing effect; if we are partly on a pixel, scale alpha down
 double scale = 1.0;
 if (x < l)
   scale -= l - std::floor(l);
@@ -138,13 +147,20 @@ void ColumnGraph::draw(Gnome::Canvas::Canvas &canvas,
 l -= ColumnView::pixels_per_sample;
   } while (++vi != vend);
   
-  // update columns
+  // Update columns
   if (columns.get() == 0)
 columns.reset(new Gnome::Canvas::Pixbuf(*canvas.root(), 0, 0, pixbuf));
   else
 columns->property_pixbuf() = pixbuf;
 }
 
+double ColumnGraph::get_max_value()
+{
+  /* Used as part of determination of the max value for all columns in
+   * the view */
+  return value_history.get_max_value();
+}
+
 
 //
 // class ColumnView
@@ -167,9 +183,10 @@ void ColumnView::do_update()
 {
   CanvasView::do_update();
   
-  // update each column graph
+  // Update each column graph
   for (column_iterator i = columns.begin(), end = columns.end(); i != end; ++i)
- // one extra because of animation
+
+ // One extra because of animation
 (*i)->update(width() / pixels_per_sample + 1);
 }
 
@@ -253,6 +270,17 @@ void ColumnView::do_detach(Monitor *monitor)
 
 void ColumnView::do_draw_loop()
 {
+  double max = 0;
+
+  /* Obtain maximum value of all columns in the view, ignoring any monitors 
with
+   * fixed maxes (their graphs are not supposed to be scaled) */
+  for (column_iterato

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 07/29: Rearrange advanced settings for monitors on Choose a Device dialog

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit b675d7d772218bb2ac2f71b531b20011f7442dda
Author: OmegaPhil 
Date:   Mon Nov 20 11:42:08 2017 +

Rearrange advanced settings for monitors on Choose a Device dialog
---
 src/ui.glade | 246 +--
 1 file changed, 105 insertions(+), 141 deletions(-)

diff --git a/src/ui.glade b/src/ui.glade
index a2c896a..1fd925c 100644
--- a/src/ui.glade
+++ b/src/ui.glade
@@ -320,6 +320,10 @@ less than default priority
 0
 Tag:  
   
+  
+1
+2
+  
 
 
   
@@ -339,6 +343,8 @@ view
   
 1
 2
+1
+2
   
 
 
@@ -347,10 +353,6 @@ view
 False
 Refresh every
   
-  
-1
-2
-  
 
 
   
@@ -361,14 +363,9 @@ view
   
 2
 3
-1
-2
   
 
 
-  
-
-
   
 Reset
 True
@@ -378,8 +375,6 @@ view
   
 3
 4
-1
-2
   
 
 
@@ -399,13 +394,14 @@ taken by the monitor
   
 1
 2
-1
-2
   
 
 
   
 
+
+  
+
   
   
 True
@@ -493,18 +489,16 @@ taken by the monitor
 5
 5
 
-  
-
-
-  
-
-
   
 True
 False
 0
 Tag:
   
+  
+1
+2
+  
 
 
   
@@ -524,6 +518,8 @@ view
   
 1
 2
+1
+2

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 14/29: DiskStatsMonitor: Convert sectors read/written to bytes read/written per duration

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 7e52bbca35bb904b9ffddabe2a90acf03de4c611
Author: OmegaPhil 
Date:   Sun Nov 26 21:49:57 2017 +

DiskStatsMonitor: Convert sectors read/written to bytes read/written per 
duration
---
 src/monitor-impls.cpp | 147 +++---
 src/monitor-impls.hpp |  15 --
 2 files changed, 114 insertions(+), 48 deletions(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index 85f5878..aaea7eb 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -410,6 +410,42 @@ Precision decimal_digits(double val, int n)
   return p;
 }
 
+Glib::ustring format_bytes_per_second(long duration_ms, double bytes,
+  bool compact)
+{
+  Glib::ustring format;
+
+  // 1000 ms = 1 s
+  double val = bytes / duration_ms * 1000;
+
+  // Debug code
+  std::cerr << String::ucompose("format_bytes_per_second formatting %1\n", 
val);
+
+  if (val <= 0) // fix weird problem with negative values
+val = 0;
+
+  if (val >= 1024 * 1024 * 1024) {
+val /= 1024 * 1024 * 1024;
+format = compact ? _("%1G") : _("%1 GB/s");
+return String::ucompose(format, decimal_digits(val, 3), val);
+  }
+  else if (val >= 1024 * 1024) {
+val /= 1024 * 1024;
+format = compact ? _("%1M") : _("%1 MB/s");
+return String::ucompose(format, decimal_digits(val, 3), val);
+  }
+  else if (val >= 1024) {
+val /= 1024;
+format = compact ? _("%1K") : _("%1 KB/s");
+return String::ucompose(format, decimal_digits(val, 3), val);
+  }
+  else
+  {
+format = compact ? _("%1B") : _("%1 B/s");
+return String::ucompose(format, decimal_digits(val, 3), val);
+  }
+}
+
 
 //
 // class CpuUsageMonitor
@@ -948,6 +984,12 @@ int DiskUsageMonitor::update_interval()
 //
 // Static initialisation
 const Glib::ustring& DiskStatsMonitor::diskstats_path = "/proc/diskstats";
+
+/* Used for working out read/write data rate - apparently the kernel always
+ * considers this the sector size for a volume:
+ * 
https://serverfault.com/questions/238033/measuring-total-bytes-written-under-linux#comment669172_239010measures
 volume sectors */
+const int DiskStatsMonitor::SECTOR_SIZE = 512;
+
 int const DiskStatsMonitor::update_interval_default = 1000;
 
 // No stats allow for negative values, so using that to detect no previous 
value
@@ -957,7 +999,7 @@ DiskStatsMonitor::DiskStatsMonitor(const Glib::ustring 
&device_name,
const Glib::ustring &tag_string)
   : Monitor(tag_string, interval), device_name(device_name),
 stat_to_monitor(stat_to_monitor), previous_value(-1), max_value(max),
-fixed_max_priv(fixed_max)
+fixed_max_priv(fixed_max), time_stamp_secs(0), time_stamp_usecs(0)
 {
 }
 
@@ -1025,21 +1067,55 @@ double DiskStatsMonitor::do_measure()
   }
 
   // Debug code
-  /*std::cerr << Glib::ustring::compose("Device '%1' stat %2: %3\n", 
device_name,
+  std::cerr << Glib::ustring::compose("Device '%1' stat %2: %3\n", device_name,
   stat_to_string(stat_to_monitor, false),
-  it->second[stat_to_monitor]);*/
+  it->second[stat_to_monitor]);
 
   double val;
   if (convert_to_rate())
   {
+/* Sectors read and written are now converted to bytes based off the
+ * relevant device's sector size, allowing for the much more interesting
+ * data rate to be reported on
+ * Conversion to bytes is left to here so as not to call fsuage on all
+ * volumes pointlessly
+ * Time of call used to get at a precise data rate, like the network load
+ * monitor does */
+int multiplication_factor;
+if (stat_to_monitor == Stat::num_bytes_read ||
+stat_to_monitor == Stat::num_bytes_written)
+{
+  multiplication_factor = SECTOR_SIZE;
+
+  /* Calculate time difference in msecs between last sample and current
+   * sample */
+  struct timeval tv;
+  if (gettimeofday(&tv, 0) == 0) {
+time_difference =
+  (tv.tv_sec - time_stamp_secs) * 1000 +
+  (tv.tv_usec - time_stamp_usecs) / 1000;
+time_stamp_secs = tv.tv_sec;
+time_stamp_usecs = tv.tv_usec;
+  }
+
+  // Debug code
+  std::cerr << Glib::ustring::compose("Device '%1' has filesystem block 
size"
+  " %2, measurement time difference 
%3\n",
+  device_name, multiplication_factor,
+  time_difference);
+}
+else
+  multiplication_factor = 1;
+
 /* Stats that need to be diffed to make a rate of change
  * Dealing with the first va

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 05/29: Monitor colours should change as soon as the colour button is set

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 2f1a15758013c4b2913698f85866a4ca65567a42
Author: OmegaPhil 
Date:   Sun Nov 19 20:47:17 2017 +

Monitor colours should change as soon as the colour button is set

In order to change a monitor's colour in the visualisation, you
need to select a monitor on the Devices tab, set the colour via the
Colour button at the bottom, then use the Change button and OK the
dialog that pops up.

The way the UI is made, it suggests the colour should update
as soon as the Colour dialog is OK'd, but it looks like it never
did - this has now been fixed.

Reported by alwayseveryth...@mail.com in #13803 /
https://bugzilla.xfce.org/show_bug.cgi?id=13803
---
 src/plugin.cpp | 29 +
 src/plugin.hpp |  8 +++-
 src/preferences-window.cpp |  3 +++
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/plugin.cpp b/src/plugin.cpp
index 9fdacc8..54e78f2 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -323,47 +323,44 @@ void Plugin::set_view(View *v)
 view->attach(*i);
 }
 
-void Plugin::viewer_type_listener(const Glib::ustring viewer_type)
+void Plugin::viewer_type_listener(const Glib::ustring viewer_type,
+  bool force_update)
 {
+  // Debug code
+  //std::cout << "Plugin::viewer_type_listener called!\n";
+
+  /* Setting viewer type, force_update allows resetting the view even when the
+   * type is already correct */
   if (viewer_type == "curve")
   {
-// Setting view to CurveView if it isnt already
-if (!dynamic_cast(view.get()))
+if (force_update || !dynamic_cast(view.get()))
   set_view(new CurveView);
   }
   else if (viewer_type == "bar")
   {
-// Setting view to horizontal BarView if it isnt already
 // It gets tricky here because them BarView can render 2 viewers.
 // Thus, we much also check the oriententation
 BarView *bar_view = dynamic_cast(view.get());
-if (!(bar_view && bar_view->is_horizontal()) )
+if (force_update || !(bar_view && bar_view->is_horizontal()) )
   set_view(new BarView);
   }
   else if (viewer_type == "vbar")
   {
-// Setting view to vertical BarView if it isnt already
 // Same situation as with "bar"
 BarView *bar_view = dynamic_cast(view.get());
-if (!(bar_view && !bar_view->is_horizontal()) )
+if (force_update || !(bar_view && !bar_view->is_horizontal()) )
   set_view(new BarView(false));
   }
   else if (viewer_type == "text") {
-
-// Setting view to TextView if it isnt already
-if (!dynamic_cast(view.get()))
+if (force_update || !dynamic_cast(view.get()))
   set_view(new TextView);
   }
   else if (viewer_type == "flame") {
-
-// Setting view to FlameView if it isnt already
-if (!dynamic_cast(view.get()))
+if (force_update || !dynamic_cast(view.get()))
   set_view(new FlameView);
   }
   else if (viewer_type == "column") {
-
-// Setting view to ColumnView if it isnt already
-if (!dynamic_cast(view.get()))
+if (force_update || !dynamic_cast(view.get()))
   set_view(new ColumnView);
   }
 
diff --git a/src/plugin.hpp b/src/plugin.hpp
index 3f71617..445b64e 100644
--- a/src/plugin.hpp
+++ b/src/plugin.hpp
@@ -85,7 +85,13 @@ public:
   const CurveView::TextOverlayPosition get_viewer_text_overlay_position();
   void set_viewer_text_overlay_position(CurveView::TextOverlayPosition
 position);
-  void viewer_type_listener(const Glib::ustring viewer_type);
+
+  /* Force update allows for this to be called to essentially reload the view
+   * e.g. when line colour is updated, despite the fact the viewer type hasn't
+   * changed */
+  void viewer_type_listener(const Glib::ustring viewer_type,
+bool force_update=false);
+
   void background_color_listener(unsigned int background_color);
   void use_background_color_listener(gboolean use_background_color);
   
diff --git a/src/preferences-window.cpp b/src/preferences-window.cpp
index 122cb71..fdb1022 100644
--- a/src/preferences-window.cpp
+++ b/src/preferences-window.cpp
@@ -1043,6 +1043,9 @@ void 
PreferencesWindow::on_monitor_colorbutton_set(Gtk::ColorButton *colorbutton
 Glib::ustring mon_dir = (*(*i)[mc.monitor]).get_settings_dir();
 
 sync_conf_with_colorbutton(mon_dir, "color", colorbutton);
+
+// Forcing an update of the view to have the new colour applied
+plugin.viewer_type_listener(plugin.get_viewer_type(), true);
   }
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
___
Xfce4-

[Xfce4-commits] [panel-plugins/xfce4-hardware-monitor-plugin] 06/29: Change Bar in BarView to store colour in color rather than fill_color

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit ad39d0cf7a8655c191935aad87587a5ef6c8a60f
Author: OmegaPhil 
Date:   Sun Nov 19 21:30:49 2017 +

Change Bar in BarView to store colour in color rather than fill_color

Nothing in the UI can change fill_color, so change it to color so
that the user can actually change it
---
 src/bar-view.cpp | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bar-view.cpp b/src/bar-view.cpp
index 6465a06..f24b2e4 100644
--- a/src/bar-view.cpp
+++ b/src/bar-view.cpp
@@ -235,11 +235,13 @@ void BarView::do_attach(Monitor *monitor)
 XfceRc* settings_ro = xfce_rc_simple_open(file, true);
 g_free(file);
 
-// Loading color
+/* Loading color - note that all other visualisations use 'color' and not
+ * 'fill_color' - prior to this it was not possible to change the colour
+ * of a Bar, as no UI widgets set 'fill_color' */
 xfce_rc_set_group(settings_ro, dir.c_str());
-if (xfce_rc_has_entry(settings_ro, "fill_color"))
+if (xfce_rc_has_entry(settings_ro, "color"))
 {
-  fill_color = xfce_rc_read_int_entry(settings_ro, "fill_color",
+  fill_color = xfce_rc_read_int_entry(settings_ro, "color",
 plugin->get_fg_color());
   color_missing = false;
 }
@@ -266,7 +268,7 @@ void BarView::do_attach(Monitor *monitor)
 
   // Saving color
   xfce_rc_set_group(settings_w, dir.c_str());
-  xfce_rc_write_int_entry(settings_w, "fill_color", int(fill_color));
+  xfce_rc_write_int_entry(settings_w, "color", int(fill_color));
 
   // Close settings file
   xfce_rc_close(settings_w);

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] branch master updated (98b1bed -> ee33421)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
change to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

  from  98b1bed   Fix C++ standard library compilation issue with old GCC
   new  81ce4de   Addition of debug code
   new  038ea89   Missing newline in error message
   new  c3b8584   Implementing user-configurable monitor refresh rates
   new  5b8d4f9   Allow to configure which CPU time is counted for CPU 
usage monitor
   new  2f1a157   Monitor colours should change as soon as the colour 
button is set
   new  ad39d0c   Change Bar in BarView to store colour in color rather 
than fill_color
   new  b675d7d   Rearrange advanced settings for monitors on Choose a 
Device dialog
   new  929b6fa   Fix CurveView to respect monitor fixed maxes when 
querying data max values
   new  91ae0ba   Implement fixed/unfixed maxes in visualisation
   new  d794d23   Fix storage of adjustment widgets
   new  fee2f1c   Actually respect fixed maxes when doing measurements
   new  4f9d1af   Column visualisation maxes from value history, fixed max 
monitors excluded from max calculations
   new  3378279   Move advanced network interfaces setup
   new  7e52bbc   DiskStatsMonitor: Convert sectors read/written to bytes 
read/written per duration
   new  5eb7bdb   Remove old WIP
   new  9cf84a5   Minor comments update, comment out debug code
   new  88df306   SwapUsageMonitor no longer has a user-configurable max, 
so dont save it
   new  7843210   Update unit reporting to reflect the fact its no longer 
always seconds, make all DiskStats durations precise
   new  c2e9777   Implement proper debug logging function when needed
   new  898a38e   Only save max if user-set fixed max is in use
   new  57a1226   Make Bar and Flame visualisations share a unified max 
from their monitors
   new  0700a56   CurveView: Treat Curves for different monitor types as 
separate synced sources, so independent maxes
   new  dab8969   Allow user to configure when monitor scales are grouped 
by type or not in the visualisation
   new  9a268f6   Move out CurveView text overlay and do_draw_loop 
implementation to CanvasView
   new  3b14798   Port all view draw_loops to the new 
process_mon_maxes_text_overlay code
   new  5b2761e   Ensure visualisations are on the bottom z-order wise so 
that text overlay is an overlay
   new  1ccfb0f   Fix monitor type sync checkbutton initialisation
   new  fd4e084   Enable text overlay for all but TextView for the user to 
choose
   new  ee33421   Remove unused setter code

The 29 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/POTFILES.in|1 +
 src/bar-view.cpp  |  119 +--
 src/bar-view.hpp  |   29 +-
 src/canvas-view.cpp   |  349 ++-
 src/canvas-view.hpp   |   41 +-
 src/choose-monitor-window.cpp |  665 ++---
 src/choose-monitor-window.hpp |   41 +-
 src/column-view.cpp   |   87 +-
 src/column-view.hpp   |   29 +-
 src/curve-view.cpp|  284 +-
 src/curve-view.hpp|   53 +-
 src/flame-view.cpp|   66 +-
 src/flame-view.hpp|   32 +-
 src/monitor-impls.cpp | 1233 +++-
 src/monitor-impls.hpp |  194 +++-
 src/monitor.hpp   |   24 +-
 src/plugin.cpp|  108 ++-
 src/plugin.hpp|   33 +-
 src/preferences-window.cpp|   70 +-
 src/preferences-window.hpp|5 +
 src/ui.glade  | 2101 +
 src/value-history.cpp |8 +
 22 files changed, 4083 insertions(+), 1489 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] [panel-plugins/xfce4-hardware-monitor-plugin] 08/29: Fix CurveView to respect monitor fixed maxes when querying data max values

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 929b6fa7cef5ad202f884df8809ed22000432602
Author: OmegaPhil 
Date:   Fri Nov 24 14:19:02 2017 +

Fix CurveView to respect monitor fixed maxes when querying data max values
---
 src/curve-view.cpp | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index 4afa4a5..296d879 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -266,7 +266,7 @@ void CurveView::do_detach(Monitor *monitor)
 
 void CurveView::do_draw_loop()
 {
-  double max = 0;
+  double max = 0, tmp_max = 0;
   Glib::ustring max_formatted, max_formatted_compact, monitor_data,
   monitor_data_compact, text_overlay_format_string, tag_string,
   separator_string = plugin->get_viewer_text_overlay_separator();
@@ -274,10 +274,20 @@ void CurveView::do_draw_loop()
   monitor_data_needed = false, monitor_data_compact_needed = false,
   text_overlay_enabled = plugin->get_viewer_text_overlay_enabled();
 
-  // Obtain maximum value of all curves in the view
+  /* Obtain maximum value of all curves in the view, respecting individual
+   * curve/monitor's fixed maxes if present */
   for (curve_iterator i = curves.begin(), end = curves.end(); i != end; ++i)
-if ((*i)->get_max_value() > max)
+  {
+if ((*i)->monitor->fixed_max())
+{
+  tmp_max = ((*i)->get_max_value() < (*i)->monitor->fixed_max()) ?
+(*i)->get_max_value() : (*i)->monitor->fixed_max();
+  if (tmp_max > max)
+max = tmp_max;
+}
+else if ((*i)->get_max_value() > max)
   max = (*i)->get_max_value();
+  }
 
   // If the text overlay is enabled, detecting all information required to 
output
   if (text_overlay_enabled)

-- 
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] [panel-plugins/xfce4-hardware-monitor-plugin] 01/29: Addition of debug code

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 81ce4de7dc2873538e040490d16e5de5b2425732
Author: OmegaPhil 
Date:   Fri Nov 17 20:03:44 2017 +

Addition of debug code
---
 src/curve-view.cpp| 14 ++
 src/value-history.cpp |  8 
 2 files changed, 22 insertions(+)

diff --git a/src/curve-view.cpp b/src/curve-view.cpp
index e3e12db..4afa4a5 100644
--- a/src/curve-view.cpp
+++ b/src/curve-view.cpp
@@ -70,9 +70,17 @@ void Curve::update(unsigned int max_samples)
 void Curve::draw(Gnome::Canvas::Canvas &canvas, int width, int height,
   double max)
 {
+  // Debug code
+  /*std::cout << "Curve::draw: Called, remaining_draws: " << remaining_draws
+<< " (" << monitor->get_short_name() << ")\n";*/
+
   if (remaining_draws <= 0)
 return;
 
+  // Debug code
+  /*std::cout << "Curve::draw: remaining_draws passed (monitor "
+<< monitor->get_short_name() << ")\n";*/
+
   --remaining_draws;
   
   double time_offset = double(remaining_draws) / CanvasView::draw_iterations;
@@ -120,6 +128,12 @@ void Curve::draw(Gnome::Canvas::Canvas &canvas, int width, 
int height,
   y = 0;
 
 points.push_back(Gnome::Art::Point(x, y));
+
+// Debug code
+/*std::cout << "x: " << x << ", y: " << y << ", width of canvas: " << width
+  << ", time offset: " << time_offset << " (monitor "
+  << monitor->get_short_name() << "\n";*/
+
 x -= CurveView::pixels_per_sample;
   } while (++vi != vend);
 
diff --git a/src/value-history.cpp b/src/value-history.cpp
index ecb08e6..ca02450 100644
--- a/src/value-history.cpp
+++ b/src/value-history.cpp
@@ -41,11 +41,19 @@ double ValueHistory::get_max_value()
 void ValueHistory::update(unsigned int max_samples, bool &new_value)
 {
   --waits_remaining;
+
+  // Debug code
+  /*std::cout << "ValueHistory::update: Called (monitor "
+<< monitor->get_short_name() << ")\n";*/
 
   if (waits_remaining <= 0) {
 new_value = true;
 monitor->measure();
 
+// Debug code
+/*std::cout << "ValueHistory::update: Measurement made (monitor "
+  << monitor->get_short_name() << ")\n";*/
+
 // Fetching new measurement
 double measurement = monitor->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] [panel-plugins/xfce4-hardware-monitor-plugin] 02/29: Missing newline in error message

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

omegaphil pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-hardware-monitor-plugin.

commit 038ea898149ea754e3a065394c276af827ca41fd
Author: OmegaPhil 
Date:   Fri Nov 17 20:04:19 2017 +

Missing newline in error message
---
 src/monitor-impls.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/monitor-impls.cpp b/src/monitor-impls.cpp
index d27d4a7..f9a717b 100644
--- a/src/monitor-impls.cpp
+++ b/src/monitor-impls.cpp
@@ -1506,7 +1506,7 @@ void 
NetworkLoadMonitor::configure_interface_names(XfcePanelPlugin *xfce_plugin)
 // Unable to obtain read-only config file - informing user
 std::cerr << _("Unable to obtain read-only config file path in order to "
"configure interface names in NetworkLoadMonitor::"
-   "configure_interface_names!");
+   "configure_interface_names!\n");
 return;
   }
 

-- 
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] [xfce/xfwm4] 01/01: I18n: Update translation ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/xfwm4.

commit 845c8fb965f896b649e9c4c53c0edd4207756178
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:35:04 2017 +0100

I18n: Update translation ca (100%).

168 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 338bdfd..04ef29e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Xfwm4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-09 00:32+0100\n"
-"PO-Revision-Date: 2017-12-09 06:10+\n"
+"PO-Revision-Date: 2017-12-18 06:55+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan (http://www.transifex.com/xfce/xfwm4/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -624,7 +624,7 @@ msgstr "Substitueix el gestor de finestres existent"
 
 #: ../src/main.c:699
 msgid "Print version information and exit"
-msgstr "Mostra la informació de la versió i surt"
+msgstr "Imprimeix la informació de la versió i surt"
 
 #: ../src/main.c:721
 msgid "[ARGUMENTS...]"
@@ -712,7 +712,7 @@ msgstr "Mou a un altre espai de _treball"
 #. 
 #: ../src/menu.c:72
 msgid "_Close"
-msgstr "_Tanca"
+msgstr "Tan_ca"
 
 #. 
 #: ../src/menu.c:75
@@ -730,12 +730,12 @@ msgstr "Reinicia"
 #: ../src/menu.c:552
 #, c-format
 msgid "%s: GtkMenu failed to grab the pointer\n"
-msgstr "%s: GtkMenu no ha pogut captura el punter\n"
+msgstr "%s: GtkMenu no ha pogut agafar el punter\n"
 
 #: ../src/terminate.c:77
 #, c-format
 msgid "Error reading data from child process: %s\n"
-msgstr "Error en llegir dades del procés fill: %s\n"
+msgstr "Error en llegir les dades del procés fill: %s\n"
 
 #: ../src/terminate.c:135
 #, c-format

-- 
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] [xfce/xfwm4] branch master updated (99f0144 -> 845c8fb)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/xfwm4.

  from  99f0144   I18n: Update translation zh_CN (100%).
   new  845c8fb   I18n: Update translation ca (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/ca.po | 10 +-
 1 file changed, 5 insertions(+), 5 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] [panel-plugins/xfce4-verve-plugin] 01/01: I18n: Update translation zh_CN (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-verve-plugin.

commit 170eda9f20bb805b7a40e1780adf7ffb5692106b
Author: 玉堂白鹤 
Date:   Mon Dec 18 12:34:35 2017 +0100

I18n: Update translation zh_CN (100%).

28 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_CN.po | 63 ++---
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c77bb80..9dce49b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,15 +5,15 @@
 # Translators:
 # Chipong Luo , 2011-2012
 # Hunt Xu , 2009
-# 玉堂白鹤 , 2015
+# 玉堂白鹤 , 2015,2017
 # Mingcong Bai , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-17 06:31+0200\n"
-"PO-Revision-Date: 2017-09-19 18:06+\n"
-"Last-Translator: Mingcong Bai \n"
+"POT-Creation-Date: 2017-11-23 00:32+0100\n"
+"PO-Revision-Date: 2017-12-18 06:29+\n"
+"Last-Translator: 玉堂白鹤 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/xfce/xfce-panel-plugins/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,99 +27,114 @@ msgid "Could not execute command (exit status %d)"
 msgstr "无法执行命令 (退出状态 %d)"
 
 #. Generate error message
-#: ../panel-plugin/verve-plugin.c:409
+#: ../panel-plugin/verve-plugin.c:434
 msgid "Could not execute command:"
 msgstr "未能执行命令："
 
 #. Create properties dialog
-#: ../panel-plugin/verve-plugin.c:1031
+#: ../panel-plugin/verve-plugin.c:1153
 msgid "Verve"
 msgstr "Verve"
 
-#: ../panel-plugin/verve-plugin.c:1054
+#: ../panel-plugin/verve-plugin.c:1176
 msgid "General"
 msgstr "一般"
 
 #. Frame for appearance settings
-#: ../panel-plugin/verve-plugin.c:1059
+#: ../panel-plugin/verve-plugin.c:1181
 msgid "Appearance"
 msgstr "外观"
 
 #. Plugin size label
-#: ../panel-plugin/verve-plugin.c:1075
+#: ../panel-plugin/verve-plugin.c:1197
 msgid "Width (in chars):"
 msgstr "宽度(字符数)："
 
 #. Plugin label label
-#: ../panel-plugin/verve-plugin.c:1100
+#: ../panel-plugin/verve-plugin.c:1222
 msgid "Label:"
 msgstr "标签："
 
+#. Frame for color settings
+#: ../panel-plugin/verve-plugin.c:1239
+msgid "Colors"
+msgstr "颜色"
+
+#. Plugin background color label
+#: ../panel-plugin/verve-plugin.c:1255
+msgid "Background color:"
+msgstr "背景颜色:"
+
+#. Plugin foreground color label
+#: ../panel-plugin/verve-plugin.c:1279
+msgid "Foreground color:"
+msgstr "前景颜色："
+
 #. Frame for behaviour settings
-#: ../panel-plugin/verve-plugin.c:1117
+#: ../panel-plugin/verve-plugin.c:1298
 msgid "History"
 msgstr "历史"
 
 #. History length label
-#: ../panel-plugin/verve-plugin.c:1133
+#: ../panel-plugin/verve-plugin.c:1314
 msgid "Number of saved history items:"
 msgstr "已保存的历史项目数量："
 
 #. Second tab
-#: ../panel-plugin/verve-plugin.c:1153 ../panel-plugin/verve-plugin.c:1157
+#: ../panel-plugin/verve-plugin.c:1334 ../panel-plugin/verve-plugin.c:1338
 msgid "Behaviour"
 msgstr "行为"
 
 #. Pattern types frame label
-#: ../panel-plugin/verve-plugin.c:1166
+#: ../panel-plugin/verve-plugin.c:1347
 msgid "Enable support for:"
 msgstr "开启支持："
 
 #. Command type: URL
-#: ../panel-plugin/verve-plugin.c:1172
+#: ../panel-plugin/verve-plugin.c:1353
 msgid "URLs (http/https/ftp/ftps)"
 msgstr "URLs (http/https/ftp/ftps)"
 
 #. Command type: email address
-#: ../panel-plugin/verve-plugin.c:1180
+#: ../panel-plugin/verve-plugin.c:1361
 msgid "Email addresses"
 msgstr "邮箱地址"
 
 #. Command type: directory path
-#: ../panel-plugin/verve-plugin.c:1188
+#: ../panel-plugin/verve-plugin.c:1369
 msgid "Directory paths"
 msgstr "目录路径"
 
-#: ../panel-plugin/verve-plugin.c:1201
+#: ../panel-plugin/verve-plugin.c:1382
 msgid "Expand variables with wordexp"
 msgstr "使用 wordexp 展开变量"
 
 #. Command type: !bang
-#: ../panel-plugin/verve-plugin.c:1211
+#: ../panel-plugin/verve-plugin.c:1392
 msgid "DuckDuckGo queries (starting with !)"
 msgstr "DuckDuckGo 查询项 (使用 ! 开头)"
 
 #. Command type: I'm feeling ducky (\)
-#: ../panel-plugin/verve-plugin.c:1219
+#: ../panel-plugin/verve-plugin.c:1400
 msgid "DuckDuckGo queries (starting with \\)"
 msgstr "DuckDuckGo 查询项 (使用 \\ 开头)"
 
 #. Fallback if the above don't match
-#: ../panel-plugin/verve-plugin.c:1227
+#: ../panel-plugin/verve-plugin.c:1408
 msgid "If the above patterns don't match:"
 msgstr "如上述格式没有匹配项："
 
 #. Smart bookmark radio button
-#: ../panel-plugin/verve-plugin.c:1233
+#: ../panel-plugin/verve-plugin.c:1414
 msgid "Use smart bookmark URL"
 msgstr "使用智能书签 URL"
 
 #. Executable command radio button (smart bookmark off)
-#: ../panel-plugin/verve-plugin.c:1256
+#: ../panel-plugin/verve-plugin.c:1437
 msgid "Run as executable command"
 msgstr "作为可执行命令运行"
 
-#: ../panel-plugin/verve-plugin.c:1268
+#: ../p

[Xfce4-commits] [panel-plugins/xfce4-time-out-plugin] 02/02: I18n: Update translation zh_CN (97%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

commit 7816afbfb56b6354eb2dafdb0d59ade1402c067c
Author: 玉堂白鹤 
Date:   Mon Dec 18 12:34:26 2017 +0100

I18n: Update translation zh_CN (97%).

34 translated messages, 1 untranslated message.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_CN.po | 16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ffc9d48..ae5a239 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,13 @@
 # Translators:
 # Chipong Luo , 2011-2012
 # Hunt Xu , 2009-2010
-# 玉堂白鹤 , 2016
+# 玉堂白鹤 , 2016-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:31+0200\n"
-"PO-Revision-Date: 2017-09-19 18:06+\n"
+"POT-Creation-Date: 2017-12-16 18:32+0100\n"
+"PO-Revision-Date: 2017-12-18 06:34+\n"
 "Last-Translator: 玉堂白鹤 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/xfce/xfce-panel-plugins/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. Create label for displaying the remaining time until the next break
+#: ../panel-plugin/time-out.c:211
+msgid "Inactive"
+msgstr ""
+
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:264
 msgid "Take a break"
@@ -104,6 +109,11 @@ msgstr "自动恢复"
 msgid "Appearance"
 msgstr "外观"
 
+#. Create note label
+#: ../panel-plugin/time-out.c:601
+msgid "Note: Icon and time cannot be hidden simultaneously."
+msgstr "注意：图标和时间不能同时隐藏。"
+
 #. Create display icon check button
 #: ../panel-plugin/time-out.c:606
 msgid "Display icon"

-- 
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] [panel-plugins/xfce4-time-out-plugin] 01/02: I18n: Update translation hr (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

commit 054157abf5da008136f9101f89f8af241c790c1b
Author: Edin Veskovic 
Date:   Mon Dec 18 12:34:26 2017 +0100

I18n: Update translation hr (100%).

35 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/hr.po | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index 80083a7..635f9c5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Edin Veskovic , 2017
 # Edin Veskovic , 2014
 # Ivica  Kolić , 2013
 # Lovro Kudelić , 2016
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xfce Panel Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 18:31+0200\n"
-"PO-Revision-Date: 2017-09-23 19:03+\n"
-"Last-Translator: Ivica  Kolić \n"
+"POT-Creation-Date: 2017-12-16 18:32+0100\n"
+"PO-Revision-Date: 2017-12-18 10:56+\n"
+"Last-Translator: Edin Veskovic \n"
 "Language-Team: Croatian 
(http://www.transifex.com/xfce/xfce-panel-plugins/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +21,11 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#. Create label for displaying the remaining time until the next break
+#: ../panel-plugin/time-out.c:211
+msgid "Inactive"
+msgstr "Neaktivno"
+
 #. Create menu item for taking an instant break
 #: ../panel-plugin/time-out.c:264
 msgid "Take a break"
@@ -104,6 +110,11 @@ msgstr "Nastavi automatski"
 msgid "Appearance"
 msgstr "Izgled"
 
+#. Create note label
+#: ../panel-plugin/time-out.c:601
+msgid "Note: Icon and time cannot be hidden simultaneously."
+msgstr "Opaska: Ikona i vrijeme ne mogu biti skriveni istodobno."
+
 #. Create display icon check button
 #: ../panel-plugin/time-out.c:606
 msgid "Display icon"

-- 
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] [panel-plugins/xfce4-verve-plugin] branch master updated (a55549a -> 170eda9)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository panel-plugins/xfce4-verve-plugin.

  from  a55549a   I18n: Update translation ms (100%).
   new  170eda9   I18n: Update translation zh_CN (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_CN.po | 63 ++---
 1 file changed, 39 insertions(+), 24 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-notifyd] 01/01: I18n: Update translation zh_CN (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository apps/xfce4-notifyd.

commit 3644a52b49d04c120592d7df8a4dfd2bb2c249a1
Author: 玉堂白鹤 
Date:   Mon Dec 18 12:33:20 2017 +0100

I18n: Update translation zh_CN (100%).

70 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_CN.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f9a2eb3..3b1c14e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-01 06:31+0100\n"
-"PO-Revision-Date: 2017-12-18 05:20+\n"
+"PO-Revision-Date: 2017-12-18 05:36+\n"
 "Last-Translator: 玉堂白鹤 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/xfce/xfce-apps/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -122,7 +122,7 @@ msgstr "设置守护进程无效"
 msgid ""
 "Empty log\n"
 "No notifications have been logged yet."
-msgstr ""
+msgstr "日志为空\n 还没有通知被记录。"
 
 #: ../xfce4-notifyd-config/main.c:941
 msgid "Refresh"

-- 
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-notifyd] branch master updated (0b249a6 -> 3644a52)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository apps/xfce4-notifyd.

  from  0b249a6   I18n: Update translation zh_CN (98%).
   new  3644a52   I18n: Update translation zh_CN (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_CN.po | 4 ++--
 1 file changed, 2 insertions(+), 2 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] [panel-plugins/xfce4-time-out-plugin] branch master updated (6824e94 -> 7816afb)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository panel-plugins/xfce4-time-out-plugin.

  from  6824e94   I18n: Update translation sk (100%).
   new  054157a   I18n: Update translation hr (100%).
   new  7816afb   I18n: Update translation zh_CN (97%).

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/hr.po| 17 ++---
 po/zh_CN.po | 16 +---
 2 files changed, 27 insertions(+), 6 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/orage] branch master updated (8f15f53 -> 9a436e8)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository apps/orage.

  from  8f15f53   I18n: Update translation ca (100%).
   new  9a436e8   I18n: Update translation ca (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/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 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/orage] 01/01: I18n: Update translation ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository apps/orage.

commit 9a436e88c8036a6d3570b1f95c7eb74d791ee2e4
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:32:48 2017 +0100

I18n: Update translation ca (100%).

1030 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index da33159..3eb4976 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-09-23 12:30+0200\n"
-"PO-Revision-Date: 2017-12-15 07:09+\n"
+"PO-Revision-Date: 2017-12-18 08:43+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/xfce/xfce-apps/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -1752,7 +1752,7 @@ msgstr "--version (-v) \t\tmostra la versió d'orage\n"
 #: ../src/main.c:316
 #, c-format
 msgid "--help (-h) \t\tprint this text\n"
-msgstr "--help (-h) \t\tmostra aquest text.\n"
+msgstr "--help (-h) \t\timprimeix aquest text.\n"
 
 #: ../src/main.c:317
 #, c-format

-- 
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/mousepad] branch master updated (518eb9b -> 95139c5)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository apps/mousepad.

  from  518eb9b   I18n: Update translation da (100%).
   new  95139c5   I18n: Update translation ca (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/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 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/gigolo] branch master updated (de56b26 -> 2f604a5)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository apps/gigolo.

  from  de56b26   I18n: Update translation da (100%).
   new  2f604a5   I18n: Update translation ca (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/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 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/mousepad] 01/01: I18n: Update translation ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository apps/mousepad.

commit 95139c5b3310c548ec2e5daa62f0a7d61f40e70f
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:32:29 2017 +0100

I18n: Update translation ca (100%).

306 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index bb8a41e..38f1e81 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-07-15 06:30+0200\n"
-"PO-Revision-Date: 2017-09-19 18:04+\n"
+"PO-Revision-Date: 2017-12-18 08:42+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/xfce/xfce-apps/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "Tanca una instància de Mousepad en execució"
 
 #: ../mousepad/main.c:45
 msgid "Print version information and exit"
-msgstr "Mostra la informació de la versió i surt"
+msgstr "Imprimeix la informació de la versió i surt"
 
 #. default application name
 #: ../mousepad/main.c:70 ../mousepad.desktop.in.in.h:1

-- 
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/gigolo] 01/01: I18n: Update translation ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository apps/gigolo.

commit 2f604a501d46f34d7ec2e07abac40251e8826b37
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:32:22 2017 +0100

I18n: Update translation ca (100%).

142 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index dcb616b..87539c4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Xfce Apps\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-07-03 20:23+0200\n"
-"PO-Revision-Date: 2017-12-15 07:05+\n"
+"PO-Revision-Date: 2017-12-18 08:43+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/xfce/xfce-apps/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr "Ignora les instàncies en execució, força l'inici 
d'una instància nov
 
 #: ../src/main.c:49
 msgid "Print a list of supported URI schemes"
-msgstr "Mostra una llista dels esquemes URI compatibles"
+msgstr "Imprimeix una llista dels esquemes URI compatibles"
 
 #: ../src/main.c:50
 msgid "Be verbose"

-- 
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] [xfce/xfce4-power-manager] 01/01: I18n: Update translation zh_CN (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/xfce4-power-manager.

commit 19005cac60724fcc3324468c186b0b804d145d6d
Author: 玉堂白鹤 
Date:   Mon Dec 18 12:31:54 2017 +0100

I18n: Update translation zh_CN (100%).

207 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_CN.po | 173 ++--
 1 file changed, 99 insertions(+), 74 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fa801c7..d69c304 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,17 +7,17 @@
 # Chris K. Zhang , 2009
 # Hunt Xu , 2008-2011
 # 玉堂白鹤 , 2013-2014
-# Xiaobo Zhou , 2014-2015
-# 玉堂白鹤 , 2015
+# xiaobo zhou , 2014-2015
+# 玉堂白鹤 , 2015,2017
 # Mingcong Bai , 2016
 # Mingcong Bai , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-26 18:30+0100\n"
-"PO-Revision-Date: 2017-09-19 18:02+\n"
-"Last-Translator: Mingcong Bai \n"
+"POT-Creation-Date: 2017-10-30 00:31+0100\n"
+"PO-Revision-Date: 2017-12-18 05:55+\n"
+"Last-Translator: 玉堂白鹤 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/xfce/xfce4-power-manager/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr "电源管理器设置"
 
 #. help dialog
 #: ../data/interfaces/xfpm-settings.ui.h:7
-#: ../panel-plugins/power-manager-plugin/power-manager-button.c:1141
+#: ../panel-plugins/power-manager-plugin/power-manager-button.c:1170
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -208,8 +208,9 @@ msgid "One minute"
 msgstr "一分钟"
 
 #: ../settings/xfpm-settings.c:614 ../settings/xfpm-settings.c:626
+#: ../settings/xfpm-settings.c:637 ../settings/xfpm-settings.c:641
 #: ../settings/xfpm-settings.c:1510
-msgid "Minutes"
+msgid "minutes"
 msgstr "分钟"
 
 #: ../settings/xfpm-settings.c:628 ../settings/xfpm-settings.c:635
@@ -221,17 +222,13 @@ msgstr "一小时"
 msgid "one minute"
 msgstr "一分钟"
 
-#: ../settings/xfpm-settings.c:637 ../settings/xfpm-settings.c:641
-msgid "minutes"
-msgstr "分钟"
-
 #: ../settings/xfpm-settings.c:639 ../settings/xfpm-settings.c:640
 #: ../settings/xfpm-settings.c:641
 msgid "hours"
 msgstr "小时"
 
 #: ../settings/xfpm-settings.c:653 ../settings/xfpm-settings.c:1503
-msgid "Seconds"
+msgid "seconds"
 msgstr "秒"
 
 #: ../settings/xfpm-settings.c:659
@@ -242,7 +239,7 @@ msgstr "%"
 #: ../settings/xfpm-settings.c:986 ../settings/xfpm-settings.c:1071
 #: ../settings/xfpm-settings.c:1163 ../settings/xfpm-settings.c:1270
 #: ../settings/xfpm-settings.c:1327 ../settings/xfpm-settings.c:1379
-#: ../src/xfpm-power.c:714
+#: ../src/xfpm-power.c:707
 msgid "Suspend"
 msgstr "挂起"
 
@@ -258,7 +255,7 @@ msgstr "不支持挂起操作"
 #: ../settings/xfpm-settings.c:992 ../settings/xfpm-settings.c:1085
 #: ../settings/xfpm-settings.c:1169 ../settings/xfpm-settings.c:1276
 #: ../settings/xfpm-settings.c:1333 ../settings/xfpm-settings.c:1385
-#: ../src/xfpm-power.c:703
+#: ../src/xfpm-power.c:696
 msgid "Hibernate"
 msgstr "休眠"
 
@@ -271,12 +268,12 @@ msgid "Hibernate operation not supported"
 msgstr "不支持休眠操作"
 
 #: ../settings/xfpm-settings.c:897 ../settings/xfpm-settings.c:1123
-#: ../settings/xfpm-settings.c:1459 ../settings/xfpm-settings.c:1583
+#: ../settings/xfpm-settings.c:1459 ../settings/xfpm-settings.c:1584
 msgid "Hibernate and suspend operations not supported"
 msgstr "不支持休眠和挂起操作"
 
 #: ../settings/xfpm-settings.c:902 ../settings/xfpm-settings.c:1128
-#: ../settings/xfpm-settings.c:1464 ../settings/xfpm-settings.c:1588
+#: ../settings/xfpm-settings.c:1464 ../settings/xfpm-settings.c:1589
 msgid "Hibernate and suspend operations not permitted"
 msgstr "不允许休眠和挂起操作"
 
@@ -286,7 +283,7 @@ msgid "Do nothing"
 msgstr "什么都不做"
 
 #: ../settings/xfpm-settings.c:936 ../settings/xfpm-settings.c:1282
-#: ../src/xfpm-power.c:725
+#: ../src/xfpm-power.c:718
 msgid "Shutdown"
 msgstr "关机"
 
@@ -307,82 +304,83 @@ msgstr "锁屏"
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "当所有计算机电源到达此电量级别"
 
-#: ../settings/xfpm-settings.c:1505
-msgid "One Minute"
-msgstr "一分钟"
+#: ../settings/xfpm-settings.c:1508 ../common/xfpm-power-common.c:139
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "分钟"
 
-#: ../settings/xfpm-settings.c:1844
+#: ../settings/xfpm-settings.c:1845
 msgid "Device"
 msgstr "设备"
 
-#: ../settings/xfpm-settings.c:1866
+#: ../settings/xfpm-settings.c:1867
 msgid "Type"
 msgstr "类型"
 
-#: ../settings/xfpm-settings.c:1871
+#: ../settings/xfpm-settings.c:1872
 msgid "PowerSupply"
 msgstr "供电"
 
-#: ../settings/xfpm-settings.c:1872 ../src/xfpm-main.c:77
+#: ../settings/xfpm-settings.c:1873 ../src/xfpm-main.c:77
 msgid "True"
 msgstr "是"
 
-#: ../settings/xfpm-settings.c:1872 ../src/xfpm-main.c:77
+#: ../settings/xfpm-settin

[Xfce4-commits] [xfce/xfce4-appfinder] 01/01: I18n: Update translation zh_CN (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/xfce4-appfinder.

commit 064a19dbad15286f36dff15fbbbcd9fbaf892ce9
Author: 玉堂白鹤 
Date:   Mon Dec 18 12:31:29 2017 +0100

I18n: Update translation zh_CN (100%).

77 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_CN.po | 102 +---
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fc7dd30..c2d556c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xfce4-appfinder\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-17 06:30+0200\n"
-"PO-Revision-Date: 2017-09-19 18:02+\n"
+"POT-Creation-Date: 2017-11-01 06:30+0100\n"
+"PO-Revision-Date: 2017-12-18 06:07+\n"
 "Last-Translator: 玉堂白鹤 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/xfce/xfce4-appfinder/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -66,98 +66,98 @@ msgstr "命令历史"
 msgid "Bookmarks"
 msgstr "书签"
 
-#: ../src/appfinder-preferences.c:219
+#: ../src/appfinder-preferences.c:238
 msgid "C_lear"
 msgstr "清除(_L)"
 
-#: ../src/appfinder-preferences.c:220
+#: ../src/appfinder-preferences.c:239
 msgid "This will permanently clear the custom command history."
 msgstr "这会永远清除自定义的命令历史。"
 
-#: ../src/appfinder-preferences.c:221
+#: ../src/appfinder-preferences.c:240
 msgid "Are you sure you want to clear the command history?"
 msgstr "您确定要清除命令历史吗？"
 
-#: ../src/appfinder-preferences.c:331
+#: ../src/appfinder-preferences.c:350
 msgid "The custom action will be deleted permanently."
 msgstr "将永远删除自定义的动作。"
 
-#: ../src/appfinder-preferences.c:332
+#: ../src/appfinder-preferences.c:351
 #, c-format
 msgid "Are you sure you want to delete pattern \"%s\"?"
 msgstr "您确定要删除类型 “%s” 吗？"
 
-#: ../src/appfinder-window.c:220 ../src/appfinder-preferences.glade.h:10
+#: ../src/appfinder-window.c:227 ../src/appfinder-preferences.glade.h:10
 #: ../data/xfce4-appfinder.desktop.in.h:1
 msgid "Application Finder"
 msgstr "应用程序查找器"
 
-#: ../src/appfinder-window.c:268
+#: ../src/appfinder-window.c:275
 msgid "Toggle view mode"
 msgstr "切换视图模式"
 
-#: ../src/appfinder-window.c:344
+#: ../src/appfinder-window.c:351
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../src/appfinder-window.c:360
+#: ../src/appfinder-window.c:368
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/appfinder-window.c:370 ../src/appfinder-window.c:1040
+#: ../src/appfinder-window.c:378 ../src/appfinder-window.c:1052
 msgid "La_unch"
 msgstr "启动(_U)"
 
-#: ../src/appfinder-window.c:854
+#: ../src/appfinder-window.c:866
 msgid "Failed to launch desktop item editor"
 msgstr "无法启动桌面项目编辑器"
 
-#: ../src/appfinder-window.c:880
+#: ../src/appfinder-window.c:892
 msgid ""
 "This will permanently remove the custom desktop file from your home "
 "directory."
 msgstr "这会从您的主文件夹中永远移除自定义的桌面文件。"
 
-#: ../src/appfinder-window.c:881
+#: ../src/appfinder-window.c:893
 #, c-format
 msgid "Are you sure you want to revert \"%s\"?"
 msgstr "您确定要恢复 “%s” 吗？"
 
-#: ../src/appfinder-window.c:891
+#: ../src/appfinder-window.c:903
 msgid "Failed to remove desktop file"
 msgstr "无法移除桌面文件"
 
 #. I18N: the first %s will be replace with users' applications directory, the
 #. * second with Hidden=true
-#: ../src/appfinder-window.c:924
+#: ../src/appfinder-window.c:936
 #, c-format
 msgid ""
 "To unhide the item you have to manually remove the desktop file from \"%s\" "
 "or open the file in the same directory and remove the line \"%s\"."
 msgstr "要隐藏此项目，您只得从 “%s” 手动移除桌面文件、或在相同的目录中打开此文件并移除行 “%s”。"
 
-#: ../src/appfinder-window.c:929 ../src/appfinder-window.c:1077
+#: ../src/appfinder-window.c:941 ../src/appfinder-window.c:1089
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../src/appfinder-window.c:930
+#: ../src/appfinder-window.c:942
 #, c-format
 msgid "Are you sure you want to hide \"%s\"?"
 msgstr "您确定要隐藏 “%s” 吗？"
 
-#: ../src/appfinder-window.c:1024
+#: ../src/appfinder-window.c:1036
 msgid "Remove From Bookmarks"
 msgstr "从书签中移除"
 
-#: ../src/appfinder-window.c:1024
+#: ../src/appfinder-window.c:1036
 msgid "Add to Bookmarks"
 msgstr "添加至书签"
 
-#: ../src/appfinder-window.c:1053
+#: ../src/appfinder-window.c:1065
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/appfinder-window.c:1070
+#: ../src/appfinder-window.c:1082
 msgid "_Revert"
 msgstr "重置(_R)"
 
@@ -181,16 +181,16 @@ msgstr "退出所有实例"
 msgid "Do not try to use or become a D-Bus service"
 msgstr "不试图使用或成为 D-Bus 服务"
 
-#: ../src/main.c:223
+#: ../src/main.c:232
 #, c-format
 msgid "Type \"%s --help\" for usage."
 msgstr "输入 “%s --help” 获取用法。"
 
-#: ../src/main.c:234
+#: ../src/main.c:243
 msgid "The Xfce development team. All rights reserved."
 msgstr "Xfce 开发团队。保留所有权利。"
 
-#: ../src/main.c:235
+#: ../src/main.c:24

[Xfce4-commits] [xfce/xfce4-power-manager] branch master updated (f390e20 -> 19005ca)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/xfce4-power-manager.

  from  f390e20   I18n: Update translation ms (100%).
   new  19005ca   I18n: Update translation zh_CN (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_CN.po | 173 ++--
 1 file changed, 99 insertions(+), 74 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] [xfce/xfce4-appfinder] branch master updated (a4794e0 -> 064a19d)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/xfce4-appfinder.

  from  a4794e0   I18n: Update translation ms (100%).
   new  064a19d   I18n: Update translation zh_CN (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_CN.po | 102 +---
 1 file changed, 56 insertions(+), 46 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] branch master updated (ccb4180 -> 7e3c7a7)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository thunar-plugins/thunar-vcs-plugin.

  from  ccb4180   I18n: Update translation en_GB (100%).
   new  7e3c7a7   I18n: Update translation ca (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/ca.po | 6 +++---
 1 file changed, 3 insertions(+), 3 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 ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository thunar-plugins/thunar-vcs-plugin.

commit 7e3c7a7f92a038394d173d70a65a1dc469e6c307
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:31:02 2017 +0100

I18n: Update translation ca (100%).

320 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 5fdb460..464add0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -5,14 +5,14 @@
 # Translators:
 # Harald Servat , 2009
 # Davidmp , 2015
-# Robert Antoni Buj Gelonch , 2016
+# Robert Antoni Buj Gelonch , 2016-2017
 # Robert Antoni Buj Gelonch , 2016
 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-09-19 18:03+\n"
+"PO-Revision-Date: 2017-12-18 08:41+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan 
(http://www.transifex.com/xfce/thunar-plugins/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -508,7 +508,7 @@ msgstr "Infinitat"
 
 #: ../tvp-git-helper/main.c:80 ../tvp-svn-helper/main.c:109
 msgid "Print version information"
-msgstr "Mostra la informació de la versió"
+msgstr "Imprimeix la informació de la versió"
 
 #: ../tvp-git-helper/main.c:87 ../tvp-svn-helper/main.c:116
 msgid "Execute add action"

-- 
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-archive-plugin] branch master updated (ac78399 -> f2acb76)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository thunar-plugins/thunar-archive-plugin.

  from  ac78399   I18n: Update translation en_GB (100%).
   new  f2acb76   I18n: Update translation zh_CN (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_CN.po | 51 ++-
 1 file changed, 30 insertions(+), 21 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-archive-plugin] 01/01: I18n: Update translation zh_CN (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository thunar-plugins/thunar-archive-plugin.

commit f2acb7617afa2baf9ed9794e688ca0a41c6b03fa
Author: 玉堂白鹤 
Date:   Mon Dec 18 12:30:50 2017 +0100

I18n: Update translation zh_CN (100%).

15 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_CN.po | 51 ++-
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f44ee03..343ec6e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,14 @@
 # Translators:
 # Chipong Luo , 2011-2012
 # Hunt Xu , 2008
+# 玉堂白鹤 , 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Thunar Plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-03 20:07+0200\n"
-"PO-Revision-Date: 2017-09-19 18:03+\n"
-"Last-Translator: Nick Schermer \n"
+"POT-Creation-Date: 2017-12-06 06:30+0100\n"
+"PO-Revision-Date: 2017-12-18 06:26+\n"
+"Last-Translator: 玉堂白鹤 \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/xfce/thunar-plugins/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,68 +21,76 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. prepare the dialog to query the preferred archiver for the user
-#: ../thunar-archive-plugin/tap-backend.c:81
+#: ../thunar-archive-plugin/tap-backend.c:77
 msgid "Select an archive manager"
 msgstr "选择归档文件管理器"
 
+#: ../thunar-archive-plugin/tap-backend.c:80
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../thunar-archive-plugin/tap-backend.c:81
+msgid "_OK"
+msgstr "确定(_O)"
+
 #. add the header label
-#: ../thunar-archive-plugin/tap-backend.c:105
+#: ../thunar-archive-plugin/tap-backend.c:99
 msgid ""
 "Please select your preferred archive manager\n"
 "from the list of available applications below:"
 msgstr "请从以下可用应用程序列表中选择您首选的\n归档文件管理器："
 
 #. tell the user that we cannot handle the specified mime types
-#: ../thunar-archive-plugin/tap-backend.c:280
-#: ../thunar-archive-plugin/tap-backend.c:427
+#: ../thunar-archive-plugin/tap-backend.c:276
+#: ../thunar-archive-plugin/tap-backend.c:424
 #, c-format
 msgid "No suitable archive manager found"
 msgstr "未找到合适的归档文件管理器"
 
-#. execute the action
-#: ../thunar-archive-plugin/tap-provider.c:336
-#: ../thunar-archive-plugin/tap-provider.c:375
+#. execute the action associated with the menu item
+#: ../thunar-archive-plugin/tap-provider.c:283
+#: ../thunar-archive-plugin/tap-provider.c:322
 msgid "Failed to extract files"
 msgstr "无法解压文件"
 
-#. execute the action
-#: ../thunar-archive-plugin/tap-provider.c:413
+#. execute the action associated with the menu item
+#: ../thunar-archive-plugin/tap-provider.c:360
 msgid "Failed to create archive"
 msgstr "无法创建归档文件"
 
-#: ../thunar-archive-plugin/tap-provider.c:468
+#: ../thunar-archive-plugin/tap-provider.c:414
 msgid "Extract _Here"
 msgstr "在此解压(_H)"
 
-#: ../thunar-archive-plugin/tap-provider.c:475
+#: ../thunar-archive-plugin/tap-provider.c:416
 msgid "Extract the selected archive in the current folder"
 msgid_plural "Extract the selected archives in the current folder"
 msgstr[0] "在当前文件夹中解压选中的的归档文件"
 
-#: ../thunar-archive-plugin/tap-provider.c:492
+#: ../thunar-archive-plugin/tap-provider.c:434
 msgid "_Extract To..."
 msgstr "解压至...(_E)"
 
-#: ../thunar-archive-plugin/tap-provider.c:500
+#: ../thunar-archive-plugin/tap-provider.c:436
 msgid "Extract the selected archive"
 msgid_plural "Extract the selected archives"
 msgstr[0] "解压选中的归档文件"
 
-#: ../thunar-archive-plugin/tap-provider.c:520
+#: ../thunar-archive-plugin/tap-provider.c:457
 msgid "Cr_eate Archive..."
 msgstr "创建归档文件...(_E)"
 
-#: ../thunar-archive-plugin/tap-provider.c:528
+#: ../thunar-archive-plugin/tap-provider.c:459
 msgid "Create an archive with the selected object"
 msgid_plural "Create an archive with the selected objects"
 msgstr[0] "用选中的对象创建一个归档文件"
 
-#. TRANSLATORS: This is the label of the Drag'n'Drop "Extract here" action
-#: ../thunar-archive-plugin/tap-provider.c:596
+#. TRANSLATORS: This is the label of the Drag'n'Drop "Extract here" menu item
+#: ../thunar-archive-plugin/tap-provider.c:526
 msgid "_Extract here"
 msgstr "在此解压(_E)"
 
-#: ../thunar-archive-plugin/tap-provider.c:603
+#: ../thunar-archive-plugin/tap-provider.c:528
 msgid "Extract the selected archive here"
 msgid_plural "Extract the selected archives here"
 msgstr[0] "在这里解压选中的归档文件"

-- 
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] [xfce/thunar] 08/08: I18n: Update translation zh_TW (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit a71a96904f6fec43e84a8940e6c397de0d5d7fbc
Author: Jeff Huang 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation zh_TW (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/zh_TW.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c1057f6..8184b06 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 13:20+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 05:50+\n"
 "Last-Translator: Jeff Huang \n"
 "Language-Team: Chinese (Taiwan) 
(http://www.transifex.com/xfce/thunar/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "因為有一個舊實體仍在執行，所以 Thunar 無法開啟。\n您想要終止舊的 thunar 
實體並啟動這個實體嗎？\n\n在接受前請確定沒有擱置中的操作（如檔案複製等），若在此時終止可能會導致您的檔案毀損。"
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar 無法在有舊 thunar 實體仍在執行時啟動。\n您想要立即終止舊的 thunar 
實體嗎？\n\n在接受前請確保沒有擱置中的操作（如檔案複製），因為此時終止可能會導致您的檔案毀損。\n\n之後請重新啟動 thunar。"
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar 檔案管理員"
 

-- 
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] [xfce/thunar] 03/08: I18n: Update translation cs (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit be309d279443402d26a6518d2d87465bff0bc5ce
Author: Michal Várady 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation cs (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/cs.po | 56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 27eeda9..99dc449 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 00:30+0100\n"
-"PO-Revision-Date: 2017-12-11 07:50+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 06:31+\n"
 "Last-Translator: Michal Várady \n"
 "Language-Team: Czech (http://www.transifex.com/xfce/thunar/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -23,14 +23,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar nelze spustit, protože je stále spuštěna starší jeho 
instance.\nChcete ukončit starou instanci Thunaru a spustit tuto?\n\n\nPřed 
odsouhlasením se ujistěte, že neprobíhají žádné operace (např. kopírování 
souborů), toto ukončení by mohlo vaše soubory poškodit."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar nelze spustit, protože je stále spuštěna starší jeho 
instance.\nChcete nyní ukončit starou instanci Thunaru?\n\n\nPřed odsouhlasením 
se ujistěte, že neprobíhají žádné operace (např. kopírování souborů), toto 
ukončení by mohlo vaše soubory poškodit.\n\nPoté Thunar restartujte."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -580,7 +582,7 @@ msgstr "Automaticky rozšířit sloupc_e podle potřeby"
 #. reset page title
 #. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:703
-#: ../thunar/thunar-list-model.c:731
+#: ../thunar/thunar-list-model.c:739
 #: ../thunar/thunar-permissions-chooser.c:233 ../thunar/thunar-util.c:454
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:513
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:293
@@ -1023,8 +1025,8 @@ msgid "%s (copy %u)"
 msgstr "%s (kopírovat %u)"
 
 #. I18N: name for first link to basename
-#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:748
-#: ../thunar/thunar-list-model.c:1573 ../thunar/thunar-list-model.c:1584
+#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:756
+#: ../thunar/thunar-list-model.c:1581 ../thunar/thunar-list-model.c:1592
 #: ../thunar/thunar-properties-dialog.c:998
 #, c-format
 msgid "link to %s"
@@ -1244,7 +1246,7 @@ msgstr[0] "Odeslat vybraný soubor do %s"
 msgstr[1] "Odeslat vybrané soubory do %s"
 msgstr[2] "Odeslat vybrané soubory do %s"
 
-#: ../thunar/thunar-list-model.c:2293
+#: ../thunar/thunar-list-model.c:2301
 #, c-format
 msgid "%d item (%s), Free space: %s"
 msgid_plural "%d items (%s), Free space: %s"
@@ -1253,7 +1255,7 @@ msgstr[1] "%d položky (%s), %s volných"
 msgstr[2] "%d položek (%s), %s volných"
 
 #. just the standard text
-#: ../thunar/thunar-list-model.c:2300
+#: ../thunar/thunar-list-model.c:2308
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
@@ -1261,7 +1263,7 @@ msgstr[0] "%d položka, %s volných"
 msgstr[1] "%d položky, %s volných"
 msgstr[2] "%d položek, %s volných"
 
-#: ../thunar/thunar-list-model.c:2309
+#: ../thunar/thunar-list-model.c:2317
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
@@ -1269,35 +1271,35 @@ msgstr[0] "%d položka"
 msgstr[1] "%d položky"
 msgstr[2] "%d položek"
 
-#: ../thunar/thunar-list-model.c:2325
+#: ../thunar/thunar-list-model.c:2333
 #, c-format
 msgid "\"%s\" broken link"
 msgstr "\"%s\" neplatný odkaz"
 
-#: ../thunar/thunar-list-model.c:2330
+#: ../thunar/thunar-list-model.c:2338
 #, c-format
 msgid "\"%s\" (%s) link to %s"
 msgstr "\"%s\" (%s) odkaz na %s"
 
-#: ../thunar/thunar-list-model.c:2336
+#: ../thunar/thunar-list-model.c:2344
 #, c-format
 msgid "\"%s\" shortcut"
 msgstr "\"%s\" záložky"
 
-#: ../thunar

[Xfce4-commits] [xfce/thunar] 07/08: I18n: Update translation sk (99%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 8244f5a52a773735d2618286276106590819317d
Author: Dušan Kazik 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation sk (99%).

737 translated messages, 1 untranslated message.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/sk.po | 624 ---
 1 file changed, 317 insertions(+), 307 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 2695a4b..2c302b5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-10 06:30+0200\n"
-"PO-Revision-Date: 2017-10-30 06:25+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 06:30+\n"
 "Last-Translator: Dušan Kazik \n"
 "Language-Team: Slovak (http://www.transifex.com/xfce/thunar/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,18 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ../thunar/main.c:90
+msgid ""
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
+"\n"
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr ""
+
 #. setup application name
-#: ../thunar/main.c:58
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -109,100 +119,100 @@ msgstr "Získané meno „%s” na zbernici správ relácie\n"
 msgid "Name '%s' lost on the message dbus, exiting."
 msgstr "Meno „%s” odstránené zo zbernice správ relácie, končím."
 
-#: ../thunar/thunar-application.c:465
+#: ../thunar/thunar-application.c:469
 msgid "The Thunar development team. All rights reserved."
 msgstr "Tím vývojárov Thunaru. Všetky práva vyhradené."
 
-#: ../thunar/thunar-application.c:466
+#: ../thunar/thunar-application.c:470
 msgid "Written by Benedikt Meurer ."
 msgstr "Napísal Benedikt Meurer ."
 
-#: ../thunar/thunar-application.c:467
+#: ../thunar/thunar-application.c:471
 #, c-format
 msgid "Please report bugs to <%s>."
 msgstr "Prosím, oznámte nájdené chyby na <%s>."
 
 #. display an error message to the user
-#: ../thunar/thunar-application.c:735
+#: ../thunar/thunar-application.c:739
 msgid "Failed to launch operation"
 msgstr "Nepodarilo sa spustiť operáciu"
 
 #. tell the user that we were unable to launch the file specified
-#: ../thunar/thunar-application.c:1438 ../thunar/thunar-application.c:1570
+#: ../thunar/thunar-application.c:1442 ../thunar/thunar-application.c:1574
 #: ../thunar/thunar-launcher.c:1222 ../thunar/thunar-location-entry.c:356
 #: ../thunar/thunar-location-entry.c:384
-#: ../thunar/thunar-shortcuts-view.c:1660
-#: ../thunar/thunar-shortcuts-view.c:1688 ../thunar/thunar-window.c:2278
+#: ../thunar/thunar-shortcuts-view.c:1653
+#: ../thunar/thunar-shortcuts-view.c:1681 ../thunar/thunar-window.c:2277
 #, c-format
 msgid "Failed to open \"%s\""
 msgstr "Nepodarilo sa otvoriť \"%s\""
 
-#: ../thunar/thunar-application.c:1574
+#: ../thunar/thunar-application.c:1578
 #, c-format
 msgid "Failed to open \"%s\": %s"
 msgstr "Nepodarilo sa otvoriť \"%s\": %s"
 
 #. display an error message
-#: ../thunar/thunar-application.c:1629
+#: ../thunar/thunar-application.c:1633
 #: ../thunar/thunar-properties-dialog.c:731
-#: ../thunar/thunar-standard-view.c:2787 ../thunar/thunar-tree-view.c:1937
+#: ../thunar/thunar-standard-view.c:2773 ../thunar/thunar-tree-view.c:1930
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Nepodarilo sa premenovať \"%s\""
 
-#: ../thunar/thunar-application.c:1731
-#: ../thunar/thunar-location-buttons.c:1331
-#: ../thunar/thunar-standard-view.c:2338 ../thunar/thunar-tree-view.c:1799
+#: ../thunar/thunar-application.c:1735
+#: ../thunar/thunar-location-buttons.c:1339
+#: ../thunar/thunar-standard-view.c:2324 ../thunar/thunar-tree-view.c:1792
 msgid "New Folder"
 msgstr "Nový priečinok"
 
-#: ../thunar/thunar-application.c:1732
-#: ../thunar/thunar-location-buttons.c:1332
-#: ../thunar/thunar-standard-view.c:2339 ../thunar/thunar-tree-view.c:1800
+#: ../thunar/thunar-application.c:1736
+#: ../thunar/thunar-location-buttons.c:1340
+#: ../thunar/thunar-standard-view.c:2325 ../thunar/thunar-tree-view.c:1793
 msgid "Create New Folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: ../thunar/thunar-application.c:1736
+#: ../thunar/thunar-application.c:1740
 msgid "New File"
 msgstr "Nový súbor"
 
-#: ../thunar/thunar-application.c:1737
+#: ../thunar/thunar-application.c:1741
 msgid "Create New File"
 msgstr "Vytvoriť nový súbor"
 
 #. generate a title for

[Xfce4-commits] [xfce/thunar] 05/08: I18n: Update translation hr (99%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 636f41e6463c9b368639871223f89dd49863729c
Author: Edin Veskovic 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation hr (99%).

737 translated messages, 1 untranslated message.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/hr.po | 56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/po/hr.po b/po/hr.po
index 603687a..91c10b6 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 00:30+0100\n"
-"PO-Revision-Date: 2017-12-13 05:30+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 10:54+\n"
 "Last-Translator: Edin Veskovic \n"
 "Language-Team: Croatian (http://www.transifex.com/xfce/thunar/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -28,14 +28,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar se ne može pokrenuti jer se trenutno izvodi ranija 
instanca.\nŽelite li prekinuti izvođenje ranije instance Thunara i pokrenuti 
ovu?\n\nPrije prihvaćanja provjerite postoje li operacije koje čekaju izvođenje 
(poput kopiranja datoteka) jer prekidanje takvih operacija može dovesti do 
grešaka na datotekama."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar se ne može pokrenuti jer se trenutno izvodi ranija 
instanca.\nŽelite li prekinuti izvođenje ranije instance Thunara sada?\n\nPrije 
prihvaćanja provjerite postoje li operacije koje čekaju izvođenje (poput 
kopiranja datoteka) jer prekidanje takvih operacija može dovesti do grešaka na 
datotekama.\n\nMolimo nakon toga ponovno pokrenite Thunar."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -585,7 +587,7 @@ msgstr "Automatski _proširi stupce po potrebi"
 #. reset page title
 #. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:703
-#: ../thunar/thunar-list-model.c:731
+#: ../thunar/thunar-list-model.c:739
 #: ../thunar/thunar-permissions-chooser.c:233 ../thunar/thunar-util.c:454
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:513
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:293
@@ -1028,8 +1030,8 @@ msgid "%s (copy %u)"
 msgstr "%s (kopija %u)"
 
 #. I18N: name for first link to basename
-#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:748
-#: ../thunar/thunar-list-model.c:1573 ../thunar/thunar-list-model.c:1584
+#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:756
+#: ../thunar/thunar-list-model.c:1581 ../thunar/thunar-list-model.c:1592
 #: ../thunar/thunar-properties-dialog.c:998
 #, c-format
 msgid "link to %s"
@@ -1249,7 +1251,7 @@ msgstr[0] "Pošalji označenu datoteku na \"%s\""
 msgstr[1] "Pošalji označene datoteke na \"%s\""
 msgstr[2] "Pošalji označene datoteke na \"%s\""
 
-#: ../thunar/thunar-list-model.c:2293
+#: ../thunar/thunar-list-model.c:2301
 #, c-format
 msgid "%d item (%s), Free space: %s"
 msgid_plural "%d items (%s), Free space: %s"
@@ -1258,7 +1260,7 @@ msgstr[1] "%d stavke (%s), slobodan prostor: %s"
 msgstr[2] "%d stavki (%s), slobodan prostor: %s"
 
 #. just the standard text
-#: ../thunar/thunar-list-model.c:2300
+#: ../thunar/thunar-list-model.c:2308
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
@@ -1266,7 +1268,7 @@ msgstr[0] "%d stavka, prazan prostor: %s"
 msgstr[1] "%d stavke, prazan prostor: %s"
 msgstr[2] "%d stavki, prazan prostor: %s"
 
-#: ../thunar/thunar-list-model.c:2309
+#: ../thunar/thunar-list-model.c:2317
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
@@ -1274,35 +1276,35 @@ msgstr[0] "%d stavka"
 msgstr[1] "%d stavke"
 msgstr[2] "%d stavki"
 
-#: ../thunar/thunar-list-model.c:2325
+#: ../thunar/thunar-list-model.c:2333
 #, c-format
 msgid "\"%s\" broken link"
 msgstr "\"%s\" neispravna poveznica"
 
-#: ../thunar/thunar-list-model.c:2330
+#: ../thunar/thunar-list-model.c:2338
 #, c-format
 msgid "\"%s\" (%s) link to %s"

[Xfce4-commits] [xfce/thunar] 06/08: I18n: Update translation pl (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 9e2f732e21c6046a2495c6e367d6628e1ed81fb2
Author: Anonymous 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation pl (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/pl.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/pl.po b/po/pl.po
index 47c6cbc..fa16394 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 10:54+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 10:52+\n"
 "Last-Translator: No Ne\n"
 "Language-Team: Polish (http://www.transifex.com/xfce/thunar/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -29,14 +29,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar nie może zostać uruchomiony, ponieważ stare wystąpienie 
programu Thunar wciąż działa.\nCzy chcesz zakończyć stare wystąpienie programu 
Thunar i uruchomić to wystąpienie?\n\nPrzed zaakceptowaniem upewnij się, że nie 
ma oczekujących operacji (np. kopiowania plików), ponieważ ich zakończenie może 
spowodować uszkodzenie plików."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar nie mógł zostać uruchomiony, ponieważ stare wystąpienie 
programu Thunar wciąż działa.\nCzy chcesz teraz zakończyć stare wystąpienie 
programu?\n\nPrzed zaakceptowaniem upewnij się, że nie ma oczekujących operacji 
(np. kopiowania plików), ponieważ ich zakończenie może spowodować uszkodzenie 
plików.\n\nNastępnie proszę ponownie uruchomić program Thunar."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 

-- 
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] [xfce/thunar] 02/08: I18n: Update translation ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 767eb85c50bbcb2d41b4d6d1b636d628c4f8f3e2
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation ca (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 56 +---
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 8594e2f..43b1c0e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-11 00:30+0100\n"
-"PO-Revision-Date: 2017-12-15 07:26+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 07:10+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan (http://www.transifex.com/xfce/thunar/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -27,14 +27,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "No es pot iniciar thunar perquè encara s'està executant una instància 
anterior de thunar.\nVoleu rescindir la instància de thunar anterior i iniciar 
aquesta instància?\nAbans d'acceptar, assegureu-vos que no hi hagi cap operació 
pendent (p. ex., la còpia de fitxers), ja que la seva finalització pot deixar 
malmesos els vostres fitxers."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "No s'ha pogut iniciar thunar perquè encara s'està executant una 
instància anterior de thunar.\nVoleu finalitzar la instància anterior thunar 
ara?\nAbans d'acceptar, assegureu-vos que no hi hagi cap operació pendent (p. 
ex., la còpia de fitxers), ja que la seva finalització pot deixar malmesos els 
vostres fitxers.\n\nSi us plau, més endavant reinicieu thunar."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -583,7 +585,7 @@ msgstr "_Expandeix les columnes automàticament si cal"
 #. reset page title
 #. tell the user that we're unable to determine the file info
 #: ../thunar/thunar-column-model.c:858 ../thunar/thunar-list-model.c:703
-#: ../thunar/thunar-list-model.c:731
+#: ../thunar/thunar-list-model.c:739
 #: ../thunar/thunar-permissions-chooser.c:233 ../thunar/thunar-util.c:454
 #: ../plugins/thunar-apr/thunar-apr-desktop-page.c:513
 #: ../plugins/thunar-apr/thunar-apr-image-page.c:293
@@ -1026,8 +1028,8 @@ msgid "%s (copy %u)"
 msgstr "%s (còpia %u)"
 
 #. I18N: name for first link to basename
-#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:748
-#: ../thunar/thunar-list-model.c:1573 ../thunar/thunar-list-model.c:1584
+#: ../thunar/thunar-io-jobs-util.c:121 ../thunar/thunar-list-model.c:756
+#: ../thunar/thunar-list-model.c:1581 ../thunar/thunar-list-model.c:1592
 #: ../thunar/thunar-properties-dialog.c:998
 #, c-format
 msgid "link to %s"
@@ -1233,7 +1235,7 @@ msgid_plural "Send the selected files to \"%s\""
 msgstr[0] "Envia el fitxer seleccionat a «%s»"
 msgstr[1] "Envia els fitxers seleccionats a «%s»"
 
-#: ../thunar/thunar-list-model.c:2293
+#: ../thunar/thunar-list-model.c:2301
 #, c-format
 msgid "%d item (%s), Free space: %s"
 msgid_plural "%d items (%s), Free space: %s"
@@ -1241,49 +1243,49 @@ msgstr[0] "%d element (%s), espai lliure: %s"
 msgstr[1] "%d elements (%s), espai lliure: %s"
 
 #. just the standard text
-#: ../thunar/thunar-list-model.c:2300
+#: ../thunar/thunar-list-model.c:2308
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
 msgstr[0] "%d element, espai lliure: %s"
 msgstr[1] "%d elements, espai lliure: %s"
 
-#: ../thunar/thunar-list-model.c:2309
+#: ../thunar/thunar-list-model.c:2317
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
 msgstr[0] "%d element"
 msgstr[1] "%d elements"
 
-#: ../thunar/thunar-list-model.c:2325
+#: ../thunar/thunar-list-model.c:2333
 #, c-format
 msgid "\"%s\" broken link"
 msgstr "«%s» enllaç trencat"
 
-#: ../thunar/thunar-list-model.c:2330
+#: ../thunar/thunar-list-model.c:2338
 #, c-format
 msgid "\"%s\" (%s) link to %s"
 msgstr "«%s» (%s) enllaça a %s"
 
-#: ../thunar/thunar-list-model.c:2336

[Xfce4-commits] [xfce/thunar] 01/08: I18n: Update translation bg (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit 454b4f48107c4261a1914fde84d78a5a9e54900b
Author: Kiril Kirilov 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation bg (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/bg.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 970e80f..96f1fdc 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 09:27+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 10:05+\n"
 "Last-Translator: Kiril Kirilov \n"
 "Language-Team: Bulgarian 
(http://www.transifex.com/xfce/thunar/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar не може да стартира, защото по- стара версия на приложението 
все още работи.\nИскате ли да изключите всички стари версии и да стартирате 
тази версия?\nПреди да потвърдите, моля да се уверите, че няма незавършени 
операции (напр. копиране на файлове), изключването на които може да доведе до 
повреждане на вашите файлове."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar не може да бъде стартиран, защото по- стара версия на на 
мениджъра все още работи.\nИскате ли да изключите всички стари копия на 
Thunar?\nПреди да потвърдите, моля да се уверите, че няма незавършени операции 
(напр. копиране на файлове), прекъсването на които може да повреди 
файловете.\nМоля, рестартирайте Thunar след това."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 

-- 
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] [xfce/thunar] branch master updated (e1b9b17 -> a71a969)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/thunar.

  from  e1b9b17   Prevent crash after updating thunar if old thunar deamon 
is still running - part II "g_application_register" before "g_application_run" 
has negative sideeffects. So "g_application_register" was moved below in order 
to trigger after "g_application_run" failed. This makes a restart of thunar 
necesarry after daemon-kill.
   new  454b4f4   I18n: Update translation bg (100%).
   new  767eb85   I18n: Update translation ca (100%).
   new  be309d2   I18n: Update translation cs (100%).
   new  c0f1aba   I18n: Update translation fr (100%).
   new  636f41e   I18n: Update translation hr (99%).
   new  9e2f732   I18n: Update translation pl (100%).
   new  8244f5a   I18n: Update translation sk (99%).
   new  a71a969   I18n: Update translation zh_TW (100%).

The 8 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/bg.po|  16 +-
 po/ca.po|  56 +++---
 po/cs.po|  56 +++---
 po/fr.po|  16 +-
 po/hr.po|  56 +++---
 po/pl.po|  16 +-
 po/sk.po| 624 ++--
 po/zh_TW.po |  16 +-
 8 files changed, 440 insertions(+), 416 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] [xfce/exo] branch master updated (1817b06 -> 1b2bff8)

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
change to branch 
master
in repository xfce/exo.

  from  1817b06   I18n: Update translation de (100%).
   new  1b2bff8   I18n: Update translation ca (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/ca.po | 12 ++--
 1 file changed, 6 insertions(+), 6 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] [xfce/thunar] 04/08: I18n: Update translation fr (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/thunar.

commit c0f1aba8fc8549a809077e7cfebc2552320ebdd0
Author: Yannick Le Guen 
Date:   Mon Dec 18 12:30:38 2017 +0100

I18n: Update translation fr (100%).

738 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/fr.po | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index 3c61023..b7eb961 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-16 00:30+0100\n"
-"PO-Revision-Date: 2017-12-16 10:34+\n"
+"POT-Creation-Date: 2017-12-18 00:30+0100\n"
+"PO-Revision-Date: 2017-12-18 09:22+\n"
 "Last-Translator: Yannick Le Guen \n"
 "Language-Team: French (http://www.transifex.com/xfce/thunar/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -35,14 +35,16 @@ msgstr ""
 
 #: ../thunar/main.c:90
 msgid ""
-"Thunar cannot be launched because an older instance of thunar is still 
running.\n"
-"Would you like to terminate the old thunar instance and start this 
instance?\n"
+"Thunar could not be launched because an older instance of thunar is still 
running.\n"
+"Would you like to terminate the old thunar instance now?\n"
 "\n"
-"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted."
-msgstr "Thunar ne peut pas être lancé car une instance plus ancienne de Thunar 
est toujours en cours d’exécution.\nVoulez-vous terminer l’ancienne instance de 
Thunar et démarrer cette instance ?\n\nAvant d’accepter, veuillez vous assurer 
qu’il n’y a aucune opération en attente (par exemple une copie de fichiers) car 
en l’interrompant vous risquez de corrompre vos fichiers."
+"Before accepting please make sure there are no pending operations (e.g. file 
copying) as terminating them may leave your files corrupted.\n"
+"\n"
+"Please restart thunar afterwards."
+msgstr "Thunar n’a pas pu être lancé car une instance plus ancienne de Thunar 
est toujours en cours d’exécution.\nDésirez-vous terminer l’ancienne instance 
de Thunar maintenant ?\n\nAvant d’accepter, veuillez vous assurer qu’aucune 
opération n’est en attente (par exemple une copie de fichiers) car en 
l’interrompant vous risquez de corrompre vos fichiers.\n\nVeuillez redémarrer 
Thunar à l’issue."
 
 #. setup application name
-#: ../thunar/main.c:125
+#: ../thunar/main.c:126
 msgid "Thunar"
 msgstr "Thunar"
 

-- 
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] [xfce/exo] 01/01: I18n: Update translation ca (100%).

2017-12-18 Thread noreply 
This is an automated email from the git hooks/post-receive script.

transifex pushed a 
commit to branch 
master
in repository xfce/exo.

commit 1b2bff872b89901faf03b26f7fe972db410836e7
Author: Robert Antoni Buj Gelonch 
Date:   Mon Dec 18 12:30:03 2017 +0100

I18n: Update translation ca (100%).

298 translated messages.

Transifex (https://www.transifex.com/xfce/public/).
---
 po/ca.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 7ce1ef2..c7183a5 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: Exo\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-07-17 00:30+0200\n"
-"PO-Revision-Date: 2017-12-14 08:15+\n"
+"PO-Revision-Date: 2017-12-18 08:46+\n"
 "Last-Translator: Robert Antoni Buj Gelonch \n"
 "Language-Team: Catalan (http://www.transifex.com/xfce/exo/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -486,12 +486,12 @@ msgstr "%s [opcions] --build-list [nom del fitxer]\n"
 #: ../exo-csource/main.c:306
 #, c-format
 msgid "  -h, --helpPrint this help message and exit\n"
-msgstr "  -h, --helpMostra aquest missatge i surt\n"
+msgstr "  -h, --helpImprimeix aquest missatge d'ajuda i surt\n"
 
 #: ../exo-csource/main.c:307
 #, c-format
 msgid "  -V, --version Print version information and exit\n"
-msgstr "  -V, --version Mostra la versió i surt\n"
+msgstr "  -V, --version Imprimeix la informació de la versió i surt\n"
 
 #: ../exo-csource/main.c:308
 #, c-format
@@ -762,7 +762,7 @@ msgstr "Preselecciona la icona de creació de fitxers 
d'escriptori"
 
 #: ../exo-desktop-item-edit/main.c:87 ../exo-helper/main.c:72
 msgid "Print version information and exit"
-msgstr "Imprimeix informació sobre la versió i surt"
+msgstr "Imprimeix la informació de la versió i surt"
 
 #. initialize Gtk+
 #: ../exo-desktop-item-edit/main.c:172
@@ -1336,12 +1336,12 @@ msgstr "exo-open --launch TIPUS [PARÀMETREs...]"
 
 #: ../exo-open/main.c:112
 msgid "  -?, --help  Print this help message and exit"
-msgstr "  -?, --help  Mostra aquest missatge i surt"
+msgstr "  -?, --help  Imprimeix aquest missatge 
d'ajuda i surt"
 
 #: ../exo-open/main.c:113
 msgid ""
 "  -V, --version   Print version information and exit"
-msgstr "  -V, --version   Mostra la versió i surt"
+msgstr "  -V, --version   Imprimeix la informació de la 
versió i surt"
 
 #: ../exo-open/main.c:115
 msgid ""

-- 
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