[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 01/01: I18n: Update translation da (97%).
This is an automated email from the git hooks/post-receive script.
t r a n s i f e x p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository thunar-plugins/thunar-vcs-plugin.
commit 219acb38a5cba820ec8d5f3ca8d785eb699c8d14
Author: Anonymous
Date: Sun Jul 1 06:30:43 2018 +0200
I18n: Update translation da (97%).
298 translated messages, 9 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
---
po/da.po | 454 ++-
1 file changed, 161 insertions(+), 293 deletions(-)
diff --git a/po/da.po b/po/da.po
index 5ec5829..5689c8c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar Plugins\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-25 00:30+0200\n"
-"PO-Revision-Date: 2018-06-26 16:12+\n"
+"POT-Creation-Date: 2018-06-27 06:30+0200\n"
+"PO-Revision-Date: 2018-07-01 01:24+\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish
(http://www.transifex.com/xfce/thunar-plugins/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -23,245 +23,118 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../thunar-vcs-plugin/tvp-git-action.c:235
-#: ../thunar-vcs-plugin/tvp-svn-action.c:273
-msgctxt "Menu"
-msgid "Add"
-msgstr "Tilføj"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:235
-#: ../thunar-vcs-plugin/tvp-svn-action.c:273 ../tvp-git-helper/main.c:153
+#: ../thunar-vcs-plugin/tvp-git-action.c:222
+#: ../thunar-vcs-plugin/tvp-svn-action.c:260 ../tvp-git-helper/main.c:153
#: ../tvp-git-helper/tgh-add.c:108 ../tvp-git-helper/tgh-add.c:121
#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-add.c:141
#: ../tvp-svn-helper/tsh-add.c:154
msgid "Add"
msgstr "Tilføj"
-#: ../thunar-vcs-plugin/tvp-git-action.c:236
-msgctxt "Menu"
-msgid "Bisect"
-msgstr "Bisect"
+#: ../thunar-vcs-plugin/tvp-git-action.c:222
+msgid "Add file contents to the index"
+msgstr "Tilføj filindhold til indekset"
-#: ../thunar-vcs-plugin/tvp-git-action.c:236
-msgid "Bisect"
-msgstr "Bisect"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:238
-#: ../thunar-vcs-plugin/tvp-svn-action.c:278
-msgctxt "Menu"
-msgid "Blame"
-msgstr "Vis ansvarlige"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:238
-#: ../thunar-vcs-plugin/tvp-svn-action.c:278 ../tvp-git-helper/main.c:157
+#: ../thunar-vcs-plugin/tvp-git-action.c:225
+#: ../thunar-vcs-plugin/tvp-svn-action.c:265 ../tvp-git-helper/main.c:157
#: ../tvp-git-helper/tgh-blame-dialog.c:129 ../tvp-svn-helper/main.c:261
#: ../tvp-svn-helper/main.c:265 ../tvp-svn-helper/tsh-blame-dialog.c:132
msgid "Blame"
msgstr "Vis ansvarlige"
-#: ../thunar-vcs-plugin/tvp-git-action.c:240
-msgctxt "Menu"
-msgid "Branch"
-msgstr "Gren"
+#: ../thunar-vcs-plugin/tvp-git-action.c:225
+#: ../thunar-vcs-plugin/tvp-svn-action.c:265
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
-#: ../thunar-vcs-plugin/tvp-git-action.c:240 ../tvp-git-helper/main.c:161
+#: ../thunar-vcs-plugin/tvp-git-action.c:227 ../tvp-git-helper/main.c:161
#: ../tvp-git-helper/tgh-branch-dialog.c:140
#: ../tvp-git-helper/tgh-stash-dialog.c:166
msgid "Branch"
msgstr "Gren"
-#: ../thunar-vcs-plugin/tvp-git-action.c:241
-#: ../thunar-vcs-plugin/tvp-svn-action.c:295
-msgctxt "Menu"
-msgid "Checkout"
-msgstr "Tjek ud"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:241
-#: ../thunar-vcs-plugin/tvp-svn-action.c:295 ../tvp-svn-helper/main.c:269
-#: ../tvp-svn-helper/tsh-checkout.c:106 ../tvp-svn-helper/tsh-checkout.c:118
-msgid "Checkout"
-msgstr "Tjek ud"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:242
-msgctxt "Menu"
-msgid "Clean"
-msgstr "Ryd"
+#: ../thunar-vcs-plugin/tvp-git-action.c:227
+msgid "List, create or switch branches"
+msgstr "Oplist, opret eller skift grene"
-#: ../thunar-vcs-plugin/tvp-git-action.c:242 ../tvp-git-helper/main.c:165
+#. unimplemented: add_subaction(item, menu, "tvp::git::checkout",
+#. _("Checkout"), _("Checkout"), "gtk-connect", _("Checkout"));
+#: ../thunar-vcs-plugin/tvp-git-action.c:229 ../tvp-git-helper/main.c:165
#: ../tvp-git-helper/tgh-clean.c:152 ../tvp-git-helper/tgh-clean-dialog.c:95
msgid "Clean"
msgstr "Ryd"
-#: ../thunar-vcs-plugin/tvp-git-action.c:244
-msgctxt "Menu"
-msgid "Clone"
-msgstr "Klon"
+#: ../thunar-vcs-plugin/tvp-git-action.c:229
+msgid "Remove untracked files from the working tree"
+msgstr "Fjern filer uden revisionsspor fra arbejdstræet"
-#: ../thunar-vcs-plugin/tvp-git-action.c:244 ../tvp-git-helper/main.c:169
+#: ../thunar-vcs-plugin/tvp-git-action.c:231 ../tvp-git-helper/main.c:169
#: ../tvp-git-helper/tgh-clone.c:115
msgid "Clone"
msgstr "Klon"
-#: ../thunar-vcs-plugin/tvp-git-action.c:245
-#: ../thunar-vcs-plugin/tvp-svn-action.c:305
-msgctxt "Menu"
-msgid "Commit"
-msgstr "Integrér"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:245
-#:
[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] branch master updated (d55d4e8 -> 219acb3)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from d55d4e8 I18n: Update translation uk (100%). new 219acb3 I18n: Update translation da (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/da.po | 454 ++- 1 file changed, 161 insertions(+), 293 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/catfish] 01/01: Force directories opened in Xfce to use the preferred file manager (bug #14483)
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository apps/catfish.
commit f2bfb28debbc033d45ea451bbab016f60ade5e24
Author: Sean Davis
Date: Sat Jun 30 21:47:35 2018 -0400
Force directories opened in Xfce to use the preferred file manager (bug
#14483)
---
catfish/CatfishWindow.py | 3 +++
po/catfish.pot | 50
2 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
index 15ab6d6..b09d8f1 100644
--- a/catfish/CatfishWindow.py
+++ b/catfish/CatfishWindow.py
@@ -943,6 +943,9 @@ class CatfishWindow(Window):
logger.debug("Opening %s" % filename)
if filename.endswith('.AppImage') and os.access(filename, os.X_OK):
command = [filename]
+elif os.path.isdir(filename) and \
+os.environ.get("XDG_CURRENT_DESKTOP").lower() == 'xfce':
+command = ['exo-open', '--launch', 'FileManager', filename]
else:
command = ['xdg-open', filename]
try:
diff --git a/po/catfish.pot b/po/catfish.pot
index 3ec8ea0..b6627a4 100644
--- a/po/catfish.pot
+++ b/po/catfish.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 08:38-0400\n"
+"POT-Creation-Date: 2018-06-30 21:44-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -137,7 +137,7 @@ msgstr ""
msgid "File Type"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1129
+#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1132
msgid "Modified"
msgstr ""
@@ -312,109 +312,109 @@ msgstr ""
msgid "Begin Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:955
+#: ../catfish/CatfishWindow.py:958
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-#: ../catfish/CatfishWindow.py:1001
+#: ../catfish/CatfishWindow.py:1004
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-#: ../catfish/CatfishWindow.py:1018
+#: ../catfish/CatfishWindow.py:1021
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-#: ../catfish/CatfishWindow.py:1058
+#: ../catfish/CatfishWindow.py:1061
#, python-format
msgid "Save \"%s\" as…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1093
+#: ../catfish/CatfishWindow.py:1096
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-#: ../catfish/CatfishWindow.py:1097
+#: ../catfish/CatfishWindow.py:1100
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-#: ../catfish/CatfishWindow.py:1100
+#: ../catfish/CatfishWindow.py:1103
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1123
+#: ../catfish/CatfishWindow.py:1126
msgid "Filename"
msgstr ""
-#: ../catfish/CatfishWindow.py:1125
+#: ../catfish/CatfishWindow.py:1128
msgid "Size"
msgstr ""
-#: ../catfish/CatfishWindow.py:1127
+#: ../catfish/CatfishWindow.py:1130
msgid "Location"
msgstr ""
-#: ../catfish/CatfishWindow.py:1139
+#: ../catfish/CatfishWindow.py:1142
msgid "Preview"
msgstr ""
-#: ../catfish/CatfishWindow.py:1147
+#: ../catfish/CatfishWindow.py:1150
msgid "Details"
msgstr ""
-#: ../catfish/CatfishWindow.py:1366
+#: ../catfish/CatfishWindow.py:1369
msgid "Today"
msgstr ""
-#: ../catfish/CatfishWindow.py:1368
+#: ../catfish/CatfishWindow.py:1371
msgid "Yesterday"
msgstr ""
-#: ../catfish/CatfishWindow.py:1449
+#: ../catfish/CatfishWindow.py:1452
msgid "No files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1451
+#: ../catfish/CatfishWindow.py:1454
msgid ""
"Try making your search less specific\n"
"or try another directory."
msgstr ""
-#: ../catfish/CatfishWindow.py:1457
+#: ../catfish/CatfishWindow.py:1460
msgid "1 file found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1459
+#: ../catfish/CatfishWindow.py:1462
#, python-format
msgid "%i files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1465
+#: ../catfish/CatfishWindow.py:1468
msgid "bytes"
msgstr ""
-#: ../catfish/CatfishWindow.py:1573 ../catfish/CatfishWindow.py:1582
+#: ../catfish/CatfishWindow.py:1576 ../catfish/CatfishWindow.py:1585
msgid "Searching…"
msgstr ""
-#: ../catfish/CatfishWindow.py:1575
+#: ../catfish/CatfishWindow.py:1578
msgid "Results will be displayed as soon as they are found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1580
+#: ../catfish/CatfishWindow.py:1583
#, python-format
msgid "Searching for \"%s\""
msgstr ""
-#: ../catfish/CatfishWindow.py:1669
+#: ../catfish/CatfishWindow.py:1672
#, python-format
msgid "Search results for \"%s\""
ms
[Xfce4-commits] [apps/catfish] branch master updated (9be5821 -> f2bfb28)
This is an automated email from the git hooks/post-receive script. b l u e s a b r e p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/catfish. from 9be5821 Save window placement. Revert to safe defaults if window size is greater than screen size (bug #14504) new f2bfb28 Force directories opened in Xfce to use the preferred file manager (bug #14483) 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: catfish/CatfishWindow.py | 3 +++ po/catfish.pot | 50 2 files changed, 28 insertions(+), 25 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 (534e7f4 -> d55d4e8)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from 534e7f4 I18n: Update translation uk (93%). new d55d4e8 I18n: Update translation uk (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/uk.po | 46 +++--- 1 file changed, 23 insertions(+), 23 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 uk (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. commit d55d4e8fd7f4f30d4ee5ee54659f48f2d9d082f9 Author: Yarema aka Knedlyk Date: Sun Jul 1 00:30:28 2018 +0200 I18n: Update translation uk (100%). 307 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/uk.po | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/po/uk.po b/po/uk.po index 7e6b13d..ad40b3c 100644 --- a/po/uk.po +++ b/po/uk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Thunar Plugins\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-27 06:30+0200\n" -"PO-Revision-Date: 2018-06-30 11:33+\n" +"PO-Revision-Date: 2018-06-30 18:01+\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian (http://www.transifex.com/xfce/thunar-plugins/language/uk/)\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgstr "Новий" #: ../thunar-vcs-plugin/tvp-git-action.c:222 msgid "Add file contents to the index" -msgstr "Додати вміст файлу до списку покажчиків" +msgstr "Додати вміст файлу до списку покажчиків" #: ../thunar-vcs-plugin/tvp-git-action.c:225 #: ../thunar-vcs-plugin/tvp-svn-action.c:265 ../tvp-git-helper/main.c:157 @@ -119,7 +119,7 @@ msgstr "Скидання" #: ../thunar-vcs-plugin/tvp-git-action.c:244 msgid "Reset current HEAD to the specified state" -msgstr "" +msgstr "Скинути поточний HEAD до визначеного стану" #: ../thunar-vcs-plugin/tvp-git-action.c:248 ../tvp-git-helper/main.c:185 #: ../tvp-git-helper/tgh-stash-dialog.c:246 @@ -128,7 +128,7 @@ msgstr "Припинити" #: ../thunar-vcs-plugin/tvp-git-action.c:248 msgid "Stash the changes in a dirty working directory away" -msgstr "" +msgstr "Усунути зміни в чорновій робочій теці" #: ../thunar-vcs-plugin/tvp-git-action.c:250 #: ../thunar-vcs-plugin/tvp-svn-action.c:389 ../tvp-git-helper/main.c:189 @@ -193,7 +193,7 @@ msgstr "Внести зміни до поточного" #: ../thunar-vcs-plugin/tvp-svn-action.c:292 msgid "Send changes from your working copy to the repository" -msgstr "" +msgstr "Вислати зміни з Вашої робочої копії до сховища" #: ../thunar-vcs-plugin/tvp-svn-action.c:297 ../tvp-svn-helper/main.c:281 #: ../tvp-svn-helper/tsh-copy.c:189 @@ -202,7 +202,7 @@ msgstr "Копіювати" #: ../thunar-vcs-plugin/tvp-svn-action.c:297 msgid "Copy a file or directory in a working copy or in the repository" -msgstr "" +msgstr "Копіювати файл або теку в робочій копії або в сховищі" #: ../thunar-vcs-plugin/tvp-svn-action.c:302 ../tvp-svn-helper/main.c:285 #: ../tvp-svn-helper/tsh-delete.c:145 ../tvp-svn-helper/tsh-delete.c:158 @@ -211,7 +211,7 @@ msgstr "Видалити" #: ../thunar-vcs-plugin/tvp-svn-action.c:302 msgid "Delete an item from a working copy or the repository" -msgstr "" +msgstr "Вилучити з робочої копії або сховища" #: ../thunar-vcs-plugin/tvp-svn-action.c:307 ../tvp-svn-helper/main.c:289 #: ../tvp-svn-helper/tsh-diff.c:239 ../tvp-svn-helper/tsh-diff-dialog.c:129 @@ -220,7 +220,7 @@ msgstr "Різниця" #: ../thunar-vcs-plugin/tvp-svn-action.c:307 msgid "Display the differences between two revisions or paths" -msgstr "" +msgstr "Показати відмінності між двома випусками або шляхами" #: ../thunar-vcs-plugin/tvp-svn-action.c:312 ../tvp-svn-helper/main.c:293 #: ../tvp-svn-helper/tsh-export.c:119 ../tvp-svn-helper/tsh-export.c:137 @@ -229,7 +229,7 @@ msgstr "Експорт" #: ../thunar-vcs-plugin/tvp-svn-action.c:312 msgid "Export a clean directory tree" -msgstr "" +msgstr "Експортувати чисте дерево тек" #: ../thunar-vcs-plugin/tvp-svn-action.c:317 ../tvp-svn-helper/main.c:297 #: ../tvp-svn-helper/tsh-import.c:126 ../tvp-svn-helper/tsh-import.c:144 @@ -238,7 +238,7 @@ msgstr "Імпорт" #: ../thunar-vcs-plugin/tvp-svn-action.c:317 msgid "Commit an unversioned file or tree into the repository" -msgstr "" +msgstr "Вислати файл або дерево без версії до сховища" #: ../thunar-vcs-plugin/tvp-svn-action.c:332 ../tvp-svn-helper/main.c:301 #: ../tvp-svn-helper/tsh-lock.c:138 ../tvp-svn-helper/tsh-lock-dialog.c:70 @@ -249,11 +249,11 @@ msgstr "Блокувати" msgid "" "Lock working copy paths in the repository so that no other user can commit " "changes to them" -msgstr "" +msgstr "Замкнути стежки робочих копій в сховищі, щоб жоден користувач не зміг додати зміни до них" #: ../thunar-vcs-plugin/tvp-svn-action.c:352 msgid "Move a file or directory" -msgstr "" +msgstr "Перемістити файл або теку" #: ../thunar-vcs-plugin/tvp-svn-action.c:363 msgid "Edit Properties" @@ -261,7 +261,7 @@ msgstr "Редагувати параметри" #: ../thunar-vcs-plugin/tvp-svn-action.c:363 msgid "Edit the property of one or more items" -msgstr "" +msgstr "Редагувати властивості одного або більше об'єктів " #: ../thunar-vc
[Xfce4-commits] [apps/ristretto] branch master updated (743c0d6 -> 125b37b)
This is an automated email from the git hooks/post-receive script. f 2 4 0 4 p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/ristretto. from 743c0d6 Return to git versioning new 125b37b Free lists properly 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: src/icon_bar.c | 3 +-- src/image_list.c | 12 src/main_window.c| 13 - src/privacy_dialog.c | 3 +-- src/thumbnailer.c| 6 ++ 5 files changed, 12 insertions(+), 25 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/ristretto] 01/01: Free lists properly
This is an automated email from the git hooks/post-receive script.
f 2 4 0 4 p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository apps/ristretto.
commit 125b37bea9c0620c1f1ea72da09fbd1f051e54e1
Author: Igor
Date: Sat Jun 30 12:42:00 2018 -0400
Free lists properly
---
src/icon_bar.c | 3 +--
src/image_list.c | 12
src/main_window.c| 13 -
src/privacy_dialog.c | 3 +--
src/thumbnailer.c| 6 ++
5 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/icon_bar.c b/src/icon_bar.c
index 189a01e..1bcb691 100644
--- a/src/icon_bar.c
+++ b/src/icon_bar.c
@@ -1725,8 +1725,7 @@ rstto_icon_bar_set_model (
g_object_unref (G_OBJECT (icon_bar->priv->model));
-g_list_foreach (icon_bar->priv->items, (GFunc)
rstto_icon_bar_item_free, NULL);
-g_list_free (icon_bar->priv->items);
+g_list_free_full (icon_bar->priv->items, (GDestroyNotify)
rstto_icon_bar_item_free);
icon_bar->priv->active_item = NULL;
icon_bar->priv->cursor_item = NULL;
icon_bar->priv->items = NULL;
diff --git a/src/image_list.c b/src/image_list.c
index f37dd8c..012a26f 100644
--- a/src/image_list.c
+++ b/src/image_list.c
@@ -638,16 +638,13 @@ rstto_image_list_remove_all (RsttoImageList *image_list)
gtk_tree_model_row_deleted(GTK_TREE_MODEL(image_list), path_);
-
-image_iter = g_list_next (image_iter);
+image_iter = g_list_next (image_iter);
}
-g_list_foreach (image_list->priv->image_monitors, (GFunc)g_object_unref,
NULL);
-g_list_free (image_list->priv->image_monitors);
+g_list_free_full (image_list->priv->image_monitors, (GDestroyNotify)
g_object_unref);
image_list->priv->image_monitors = NULL;
-g_list_foreach (image_list->priv->images, (GFunc)g_object_unref, NULL);
-g_list_free (image_list->priv->images);
+g_list_free_full (image_list->priv->images, (GDestroyNotify)
g_object_unref);
image_list->priv->images = NULL;
iter = image_list->priv->iterators;
@@ -848,8 +845,7 @@ rstto_image_list_monitor_dir (
if (image_list->priv->image_monitors)
{
-g_list_foreach (image_list->priv->image_monitors,
(GFunc)g_object_unref, NULL);
-g_list_free (image_list->priv->image_monitors);
+g_list_free_full (image_list->priv->image_monitors, (GDestroyNotify)
g_object_unref);
image_list->priv->image_monitors = NULL;
}
diff --git a/src/main_window.c b/src/main_window.c
index 78c0be2..9387689 100644
--- a/src/main_window.c
+++ b/src/main_window.c
@@ -1406,8 +1406,7 @@ rstto_main_window_image_list_iter_changed
(RsttoMainWindow *window)
menu_item = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (open_with_menu),
menu_item);
-g_list_foreach (app_list, (GFunc)g_object_unref, NULL);
-g_list_free (app_list);
+g_list_free_full (app_list, (GDestroyNotify) g_object_unref);
}
else
{
@@ -3219,8 +3218,7 @@ cb_rstto_main_window_open_image (GtkWidget *widget,
RsttoMainWindow *window)
if (files)
{
-g_slist_foreach (files, (GFunc)g_object_unref, NULL);
-g_slist_free (files);
+g_slist_free_full (files, (GDestroyNotify) g_object_unref);
}
}
@@ -4258,11 +4256,8 @@ rstto_main_window_launch_editor_chooser (
gtk_widget_destroy (dialog);
-g_list_foreach (app_infos_recommended, (GFunc)g_object_unref, NULL);
-g_list_foreach (app_infos_all, (GFunc)g_object_unref, NULL);
-
-g_list_free (app_infos_recommended);
-g_list_free (app_infos_all);
+g_list_free_full (app_infos_recommended, (GDestroyNotify) g_object_unref);
+g_list_free_full (app_infos_all, (GDestroyNotify) g_object_unref);
g_list_free (files);
}
diff --git a/src/privacy_dialog.c b/src/privacy_dialog.c
index 40cc57a..7b1fec6 100644
--- a/src/privacy_dialog.c
+++ b/src/privacy_dialog.c
@@ -395,8 +395,7 @@ rstto_recent_chooser_get_items (
all_items_iter = g_list_next (all_items_iter);
}
-g_list_foreach (all_items, (GFunc)gtk_recent_info_unref, NULL);
-g_list_free (all_items);
+g_list_free_full (all_items, (GDestroyNotify) gtk_recent_info_unref);
return items;
}
diff --git a/src/thumbnailer.c b/src/thumbnailer.c
index ba7be67..ab7913e 100644
--- a/src/thumbnailer.c
+++ b/src/thumbnailer.c
@@ -352,8 +352,7 @@ rstto_thumbnailer_dequeue_file (
* being processed, no big deal */
}
thumbnailer->priv->handle = 0;
-g_slist_foreach (thumbnailer->priv->in_process_queue,
(GFunc)g_object_unref, NULL);
-g_slist_free (thumbnailer->priv->in_process_queue);
+g_slist_free_full (thumbnailer->priv->in_process_queue,
(GDestroyNotify) g_object_unref);
t
[Xfce4-commits] [apps/xfce4-terminal] 01/01: I18n: Update translation uk (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/xfce4-terminal. commit 813a0265496b615bc04ec271a49a62a97404b9a0 Author: Yarema aka Knedlyk Date: Sat Jun 30 18:32:51 2018 +0200 I18n: Update translation uk (100%). 394 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/uk.po | 295 +-- 1 file changed, 157 insertions(+), 138 deletions(-) diff --git a/po/uk.po b/po/uk.po index 79541e7..7869075 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,15 +12,15 @@ msgid "" msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-16 18:31+0200\n" -"PO-Revision-Date: 2018-04-27 11:44+\n" +"POT-Creation-Date: 2018-06-19 00:31+0200\n" +"PO-Revision-Date: 2018-06-30 11:21+\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian (http://www.transifex.com/xfce/xfce-apps/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" #: ../colorschemes/black-on-white.theme.in.h:1 msgid "Black on White" @@ -68,7 +68,7 @@ msgstr "Загальні опції" #. parameter of --default-display #. parameter of --display -#: ../terminal/main.c:111 ../terminal/main.c:144 +#: ../terminal/main.c:111 ../terminal/main.c:148 msgid "display" msgstr "дисплей" @@ -102,71 +102,78 @@ msgstr "назва" msgid "mode" msgstr "режим" -#: ../terminal/main.c:142 +#. parameter of --color-text +#. parameter of --color-bg +#: ../terminal/main.c:136 ../terminal/main.c:138 +msgid "color" +msgstr "колір" + +#: ../terminal/main.c:146 msgid "Window Options" msgstr "Опції вікна" #. parameter of --geometry -#: ../terminal/main.c:146 +#: ../terminal/main.c:150 msgid "geometry" msgstr "геометрія" #. parameter of --role -#: ../terminal/main.c:148 +#: ../terminal/main.c:152 msgid "role" msgstr "роль" #. parameter of --startup-id -#: ../terminal/main.c:150 +#: ../terminal/main.c:154 msgid "string" msgstr "стрічка" #. parameter of --icon -#: ../terminal/main.c:152 +#: ../terminal/main.c:156 msgid "icon" msgstr "значок" #. parameter of --font -#: ../terminal/main.c:154 +#: ../terminal/main.c:158 msgid "font" msgstr "шрифт" #. parameter of --zoom -#: ../terminal/main.c:156 +#: ../terminal/main.c:160 msgid "zoom" msgstr "зміна розміру" -#: ../terminal/main.c:158 +#: ../terminal/main.c:162 #, c-format msgid "See the %s man page for full explanation of the options above." msgstr "Дивіться %s сторінку man для повного пояснення наведених вище опцій." -#: ../terminal/main.c:191 ../xfce4-terminal.desktop.in.h:1 +#: ../terminal/main.c:196 ../xfce4-terminal.desktop.in.h:1 +#: ../xfce4-terminal-settings.desktop.in.h:1 msgid "Xfce Terminal" msgstr "Термінал XFCE" -#: ../terminal/main.c:207 +#: ../terminal/main.c:212 msgid "The Xfce development team. All rights reserved." msgstr "Команда розробників Xfce. Всі права застережено." -#: ../terminal/main.c:208 +#: ../terminal/main.c:213 msgid "Written by Benedikt Meurer ," msgstr "Написано через Benedikt Meurer " -#: ../terminal/main.c:209 +#: ../terminal/main.c:214 msgid "Nick Schermer " msgstr "Nick Schermer " -#: ../terminal/main.c:210 +#: ../terminal/main.c:215 msgid "and Igor Zakharov ." msgstr "та Igor Zakharov ." -#: ../terminal/main.c:211 +#: ../terminal/main.c:216 #, c-format msgid "Please report bugs to <%s>." msgstr "Сповіщайте про помилки до <%s>." -#: ../terminal/main.c:318 +#: ../terminal/main.c:334 #, c-format msgid "Unable to register terminal service: %s\n" msgstr "Не вдається зареєструвати службу терміналу: %s\n" @@ -284,136 +291,136 @@ msgstr "Невідповідний ідентифікатор користува msgid "Display mismatch" msgstr "Показати відмінності" -#: ../terminal/terminal-options.c:220 +#: ../terminal/terminal-options.c:203 #, c-format msgid "" "Option \"--default-display\" requires specifying the default X display as " "its parameter" msgstr "Для параметра \"--default-display\" потрібно вказати аргумент з типовим X-дисплеєм" -#: ../terminal/terminal-options.c:236 +#: ../terminal/terminal-options.c:219 #, c-format msgid "" "Option \"--default-working-directory\" requires specifying the default " "working directory as its parameter" msgstr "Для параметра \"--default-working-directory\" потрібно вк
[Xfce4-commits] [apps/orage] branch master updated (7d0a71e -> 3c2217d)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/orage. from 7d0a71e I18n: Update translation it (100%). new 3c2217d I18n: Update translation it (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/it.po | 56 1 file changed, 28 insertions(+), 28 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 it (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/orage. commit 3c2217df2921949e41a84db9bf137085c1771b0d Author: Emanuele Petriglia Date: Sat Jun 30 18:32:17 2018 +0200 I18n: Update translation it (100%). 1030 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/it.po | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/po/it.po b/po/it.po index 5e50b1b..96eb795 100644 --- a/po/it.po +++ b/po/it.po @@ -15,7 +15,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: 2018-06-24 11:07+\n" +"PO-Revision-Date: 2018-06-30 13:34+\n" "Last-Translator: Emanuele Petriglia \n" "Language-Team: Italian (http://www.transifex.com/xfce/xfce-apps/language/it/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "bassa" #: ../globaltime/globaltime.c:100 msgid "Raising GlobalTime window..." -msgstr "Apertura finestra Ora globale..." +msgstr "Apertura finestra Ora globale…" #: ../globaltime/globaltime.c:102 msgid "GlobalTime window raise failed" @@ -575,7 +575,7 @@ msgstr "Orage" #. Create file chooser #: ../src/appointment.c:672 ../src/interface.c:264 ../src/parameters.c:374 msgid "Select a file..." -msgstr "Selezionare un file..." +msgstr "Selezionare un file…" #: ../src/appointment.c:680 msgid "Sound Files" @@ -619,16 +619,16 @@ msgstr "File predefinito di Orage" #: ../src/appointment.c:1225 msgid "Appointment addition failed." -msgstr "Aggiunta dell'appuntamento non riuscita" +msgstr "Impossibile aggiungere l'appuntamento." #: ../src/appointment.c:1226 msgid "" "Error happened when adding appointment. Look more details from the log file." -msgstr "Errore aggiungendo l'appuntamento; per maggiori dettagli consultare il file di log." +msgstr "Errore aggiungendo l'appuntamento. Per maggiori dettagli consultare il file di log." #: ../src/appointment.c:1236 msgid "Appointment update failed." -msgstr "Aggiornamento dell'appuntamento non riuscito" +msgstr "Impossibile aggiornare l'appuntamento." #: ../src/appointment.c:1237 msgid "" @@ -651,7 +651,7 @@ msgstr "Sì, rimuovi" #: ../src/appointment.c:1378 ../src/appointment.c:1393 ../src/day-view.c:457 #: ../src/event-list.c:1028 msgid "Pick the date" -msgstr "Seleziona della data" +msgstr "Selezionare la data" #: ../src/appointment.c:1380 ../src/appointment.c:1395 ../src/day-view.c:386 #: ../src/day-view.c:459 ../src/event-list.c:1030 ../src/event-list.c:1180 @@ -665,7 +665,7 @@ msgstr "Questo appuntamento non esiste." #: ../src/appointment.c:1804 msgid "It was probably removed, please refresh your screen." -msgstr "Probabilmente è stato rimosso, si prega di aggiornare la schermata." +msgstr "Probabilmente è stato rimosso, aggiornare la schermata." #: ../src/appointment.c:2105 msgid "Current categories" @@ -673,7 +673,7 @@ msgstr "Categorie correnti" #: ../src/appointment.c:2120 msgid "Add new category with color" -msgstr "Aggiungere una nuova categoria con un colore" +msgstr "Aggiunge una nuova categoria con un colore" #: ../src/appointment.c:2124 msgid "Category:" @@ -713,7 +713,7 @@ msgstr "Salva" #: ../src/appointment.c:2704 msgid "Save and close" -msgstr "Salva e chiude" +msgstr "Salva e chiudi" #: ../src/appointment.c:2709 msgid "Revert" @@ -752,7 +752,7 @@ msgstr "Evento" msgid "" "Event that will happen sometime. For example:\n" "Meeting or birthday or TV show." -msgstr "Evento che accadrà un giorno; per esempio:\nun incontro, un compleanno, o uno spettacolo alla TV" +msgstr "Evento che accadrà un giorno, per esempio:\nun incontro, un compleanno od uno spettacolo televisivo." #: ../src/appointment.c:2752 ../src/event-list.c:1274 msgid "Todo" @@ -762,7 +762,7 @@ msgstr "Compito" msgid "" "Something that you should do sometime. For example:\n" "Wash your car or test new version of Orage." -msgstr "Qualcosa che dovrebbe essere fatto prima o poi; per esempio:\nlavare la propria auto o provare la nuova versione di Orage" +msgstr "Qualcosa che dovrebbe essere fatto prima o poi, per esempio:\nlavare la propria auto o provare la nuova versione di Orage." #: ../src/appointment.c:2758 ../src/event-list.c:1287 msgid "Journal" @@ -772,7 +772,7 @@ msgstr "Note del giorno" msgid "" "Make a note that something happened. For example:\n" "Remark that your mother called or first snow came." -msgstr "Scrivere una nota per ricordare che è successo qualcosa; per esempio:\nannota che la mamma ha chiamato o che è scesa la prima neve" +msgstr "Si può scrivere una nota per ricordare che è successo qualcosa, per esempio:\nricordarsi che la mamma ha chiamato o che è scesa la prima nev
[Xfce4-commits] [apps/mousepad] 01/01: I18n: Update translation uk (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository apps/mousepad. commit fb6571e9761b0dd098a7587183365a89156bb614 Author: Yarema aka Knedlyk Date: Sat Jun 30 18:32:07 2018 +0200 I18n: Update translation uk (100%). 308 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/uk.po | 469 --- 1 file changed, 241 insertions(+), 228 deletions(-) diff --git a/po/uk.po b/po/uk.po index 8a69321..525fd20 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,20 +4,20 @@ # # Translators: # Yarema aka Knedlyk , 2012 -# Yarema aka Knedlyk , 2014-2016 +# Yarema aka Knedlyk , 2014-2016,2018 msgid "" 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:05+\n" +"POT-Creation-Date: 2018-06-05 06:31+0200\n" +"PO-Revision-Date: 2018-06-30 11:23+\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian (http://www.transifex.com/xfce/xfce-apps/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" #: ../mousepad/main.c:42 msgid "Do not register with the D-BUS session message bus" @@ -55,122 +55,122 @@ msgstr "Команда розробки Xfce. Всі права застереж msgid "Please report bugs to <%s>." msgstr "Будь ласка, повідомте про ваду до <%s>." -#: ../mousepad/mousepad-dialogs.c:40 +#: ../mousepad/mousepad-dialogs.c:41 msgid "Mousepad is a fast text editor for the Xfce Desktop Environment." msgstr "Mousepad - це швидкий текстовий редактор для серередовища робочого столу Xfce." -#: ../mousepad/mousepad-dialogs.c:45 +#: ../mousepad/mousepad-dialogs.c:46 msgid "translator-credits" msgstr "Yarema aka Knedlyk " #. display an error message to the user -#: ../mousepad/mousepad-dialogs.c:100 +#: ../mousepad/mousepad-dialogs.c:101 msgid "Failed to open the documentation browser" msgstr "Невдача при відкриванні переглядача документації" #. build dialog -#: ../mousepad/mousepad-dialogs.c:115 +#: ../mousepad/mousepad-dialogs.c:116 msgid "Select Tab Size" msgstr "Вибрати розмір вкладки" #. build the dialog -#: ../mousepad/mousepad-dialogs.c:196 +#: ../mousepad/mousepad-dialogs.c:197 msgid "Go To" msgstr "Перейти до" -#: ../mousepad/mousepad-dialogs.c:218 +#: ../mousepad/mousepad-dialogs.c:219 msgid "_Line number:" msgstr "_Номер стрічки:" -#: ../mousepad/mousepad-dialogs.c:237 +#: ../mousepad/mousepad-dialogs.c:238 msgid "C_olumn number:" msgstr "Номе_р колонки:" -#: ../mousepad/mousepad-dialogs.c:295 +#: ../mousepad/mousepad-dialogs.c:296 msgid "Remove all entries from the documents history?" msgstr "Вилучити все з історії документів?" -#: ../mousepad/mousepad-dialogs.c:300 +#: ../mousepad/mousepad-dialogs.c:301 msgid "Clear Documents History" msgstr "Очистити історію документів" -#: ../mousepad/mousepad-dialogs.c:303 +#: ../mousepad/mousepad-dialogs.c:304 msgid "" "Clearing the documents history will permanently remove all currently listed " "entries." msgstr "Очищення історії документів назавжди вилучить всю записану історію документів." -#: ../mousepad/mousepad-dialogs.c:334 +#: ../mousepad/mousepad-dialogs.c:335 msgid "Do you want to save the changes before closing?" msgstr "Ви бажаєте зберегти зміни перед закриттям?" -#: ../mousepad/mousepad-dialogs.c:335 +#: ../mousepad/mousepad-dialogs.c:336 msgid "Save Changes" msgstr "Зберегти зміни" -#: ../mousepad/mousepad-dialogs.c:336 +#: ../mousepad/mousepad-dialogs.c:337 msgid "_Don't Save" msgstr "Не _зберігати" #. secondary text -#: ../mousepad/mousepad-dialogs.c:358 +#: ../mousepad/mousepad-dialogs.c:359 msgid "If you don't save the document, all the changes will be lost." msgstr "Якщо Ви не збережете документ, тоді зміни будуть втрачені." -#: ../mousepad/mousepad-dialogs.c:380 +#: ../mousepad/mousepad-dialogs.c:381 msgid "" "The document has been externally modified. Do you want to continue saving?" msgstr "Документ було змінено ззовні. Ви бажаєте продовжити записування?" -#: ../mousepad/mousepad-dialogs.c:381 +#: ../mousepad/mousepad-dialogs.c:382 msgid "Externally Modified" msgstr "Зовнішньо змінено" -#: ../mousepad/mousepad-dialogs.c:383 +#: ../mousepad/mousepad-dialogs.c:384 msgid "If you save the document, all of
[Xfce4-commits] [apps/xfce4-terminal] branch master updated (ec9a105 -> 813a026)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/xfce4-terminal. from ec9a105 I18n: Update translation nb (100%). new 813a026 I18n: Update translation uk (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/uk.po | 295 +-- 1 file changed, 157 insertions(+), 138 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 uk (93%).
This is an automated email from the git hooks/post-receive script.
t r a n s i f e x p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository thunar-plugins/thunar-vcs-plugin.
commit 534e7f486213a6b134d4375da1ec7de4e978dda3
Author: Yarema aka Knedlyk
Date: Sat Jun 30 18:30:46 2018 +0200
I18n: Update translation uk (93%).
286 translated messages, 21 untranslated messages.
Transifex (https://www.transifex.com/xfce/public/).
---
po/uk.po | 1124 +-
1 file changed, 516 insertions(+), 608 deletions(-)
diff --git a/po/uk.po b/po/uk.po
index 63b92f4..7e6b13d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Thunar Plugins\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-05-24 06:30+0200\n"
-"PO-Revision-Date: 2018-05-24 20:09+\n"
-"Last-Translator: zubr139\n"
+"POT-Creation-Date: 2018-06-27 06:30+0200\n"
+"PO-Revision-Date: 2018-06-30 11:33+\n"
+"Last-Translator: Yarema aka Knedlyk \n"
"Language-Team: Ukrainian
(http://www.transifex.com/xfce/thunar-plugins/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,239 +20,132 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11
? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 >
14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100
>=11 && n % 100 <=14 )) ? 2: 3);\n"
-#: ../thunar-vcs-plugin/tvp-git-action.c:242
-#: ../thunar-vcs-plugin/tvp-svn-action.c:280
-msgid "Menu|Add"
-msgstr "Додати"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:242
-#: ../thunar-vcs-plugin/tvp-svn-action.c:280 ../tvp-git-helper/main.c:153
+#: ../thunar-vcs-plugin/tvp-git-action.c:222
+#: ../thunar-vcs-plugin/tvp-svn-action.c:260 ../tvp-git-helper/main.c:153
#: ../tvp-git-helper/tgh-add.c:108 ../tvp-git-helper/tgh-add.c:121
-#: ../tvp-svn-helper/main.c:259 ../tvp-svn-helper/tsh-add.c:119
-#: ../tvp-svn-helper/tsh-add.c:132
+#: ../tvp-svn-helper/main.c:257 ../tvp-svn-helper/tsh-add.c:141
+#: ../tvp-svn-helper/tsh-add.c:154
msgid "Add"
msgstr "Новий"
-#: ../thunar-vcs-plugin/tvp-git-action.c:243
-msgid "Menu|Bisect"
-msgstr "Розділити"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:243
-msgid "Bisect"
-msgstr "Розділити"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:245
-#: ../thunar-vcs-plugin/tvp-svn-action.c:285
-msgid "Menu|Blame"
-msgstr "Застереження"
+#: ../thunar-vcs-plugin/tvp-git-action.c:222
+msgid "Add file contents to the index"
+msgstr "Додати вміст файлу до списку покажчиків"
-#: ../thunar-vcs-plugin/tvp-git-action.c:245
-#: ../thunar-vcs-plugin/tvp-svn-action.c:285 ../tvp-git-helper/main.c:157
-#: ../tvp-git-helper/tgh-blame-dialog.c:129 ../tvp-svn-helper/main.c:263
-#: ../tvp-svn-helper/main.c:267 ../tvp-svn-helper/tsh-blame-dialog.c:132
+#: ../thunar-vcs-plugin/tvp-git-action.c:225
+#: ../thunar-vcs-plugin/tvp-svn-action.c:265 ../tvp-git-helper/main.c:157
+#: ../tvp-git-helper/tgh-blame-dialog.c:129 ../tvp-svn-helper/main.c:261
+#: ../tvp-svn-helper/main.c:265 ../tvp-svn-helper/tsh-blame-dialog.c:132
msgid "Blame"
msgstr "Застереження"
-#: ../thunar-vcs-plugin/tvp-git-action.c:247
-msgid "Menu|Branch"
-msgstr "Гілка"
+#: ../thunar-vcs-plugin/tvp-git-action.c:225
+#: ../thunar-vcs-plugin/tvp-svn-action.c:265
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Показати, який випуск і який автор востаннє змінював кожний рядок
файлу"
-#: ../thunar-vcs-plugin/tvp-git-action.c:247 ../tvp-git-helper/main.c:161
+#: ../thunar-vcs-plugin/tvp-git-action.c:227 ../tvp-git-helper/main.c:161
#: ../tvp-git-helper/tgh-branch-dialog.c:140
#: ../tvp-git-helper/tgh-stash-dialog.c:166
msgid "Branch"
msgstr "Гілка"
-#: ../thunar-vcs-plugin/tvp-git-action.c:248
-#: ../thunar-vcs-plugin/tvp-svn-action.c:302
-msgid "Menu|Checkout"
-msgstr "Перевірити"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:248
-#: ../thunar-vcs-plugin/tvp-svn-action.c:302 ../tvp-svn-helper/main.c:271
-#: ../tvp-svn-helper/tsh-checkout.c:100 ../tvp-svn-helper/tsh-checkout.c:112
-msgid "Checkout"
-msgstr "Скачати останній"
-
-#: ../thunar-vcs-plugin/tvp-git-action.c:249
-msgid "Menu|Clean"
-msgstr "Очистити"
+#: ../thunar-vcs-plugin/tvp-git-action.c:227
+msgid "List, create or switch branches"
+msgstr "Показати список, створити або поміняти гілки"
-#: ../thunar-vcs-plugin/tvp-git-action.c:249 ../tvp-git-helper/main.c:165
-#: ../tvp-git-helper/tgh-clean.c:152 ../tvp-git-helper/tgh-clean-dialog.c:96
+#. unimplemented: add_subaction(item, menu, "tvp::git::checkout",
+#. _("Checkout"), _("Checkout"), "gtk-connect", _("Checkout"));
+#: ../thunar-vcs-plugin/tvp-git-action.c:229 ../tvp-git-helper/main.c:165
+#: ../tvp-git-helper/tgh-clean.c:152 ../tvp-git-helper/tgh-clean-dialog.c:95
[Xfce4-commits] [apps/mousepad] branch master updated (9c34244 -> fb6571e)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/mousepad. from 9c34244 I18n: Update translation sr (100%). new fb6571e I18n: Update translation uk (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/uk.po | 469 --- 1 file changed, 241 insertions(+), 228 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 (916afbc -> 534e7f4)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository thunar-plugins/thunar-vcs-plugin. from 916afbc I18n: Update translation fr (93%). new 534e7f4 I18n: Update translation uk (93%). 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/uk.po | 1124 +- 1 file changed, 516 insertions(+), 608 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 uk (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/thunar. commit 858fff1cb844f7fdf5881bef86095ce642ddf586 Author: Yarema aka Knedlyk Date: Sat Jun 30 18:30:34 2018 +0200 I18n: Update translation uk (100%). 746 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/uk.po | 739 +-- 1 file changed, 385 insertions(+), 354 deletions(-) diff --git a/po/uk.po b/po/uk.po index d024327..6ee4994 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,17 +12,17 @@ msgid "" msgstr "" "Project-Id-Version: Thunar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-05-06 00:30+0200\n" -"PO-Revision-Date: 2018-05-16 08:43+\n" +"POT-Creation-Date: 2018-06-25 00:30+0200\n" +"PO-Revision-Date: 2018-06-30 11:19+\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian (http://www.transifex.com/xfce/thunar/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" -#: ../thunar/main.c:90 +#: ../thunar/main.c:89 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" @@ -33,7 +33,7 @@ msgid "" msgstr "Неможливо запустити Thunar, оскільки один екземпляр вже запущений раніше.\nВи бажаєте припинити роботу цього екземпляру?\n\nПеред тим, як дати згоду, впевніться, що немає незакінчених операцій (наприклад копіювання файлів), оскільки це може привести до пошкодження файлів.\n\nВ противному разі перезавантажте thunar." #. setup application name -#: ../thunar/main.c:126 +#: ../thunar/main.c:125 msgid "Thunar" msgstr "Thunar" @@ -140,10 +140,10 @@ msgstr "Не вдається виконати операцію" #. tell the user that we were unable to launch the file specified #: ../thunar/thunar-application.c:1442 ../thunar/thunar-application.c:1574 -#: ../thunar/thunar-launcher.c:1222 ../thunar/thunar-location-entry.c:356 +#: ../thunar/thunar-launcher.c:1216 ../thunar/thunar-location-entry.c:356 #: ../thunar/thunar-location-entry.c:384 -#: ../thunar/thunar-shortcuts-view.c:1650 -#: ../thunar/thunar-shortcuts-view.c:1678 ../thunar/thunar-window.c:2274 +#: ../thunar/thunar-shortcuts-view.c:1680 +#: ../thunar/thunar-shortcuts-view.c:1708 ../thunar/thunar-window.c:2317 #, c-format msgid "Failed to open \"%s\"" msgstr "Не вдається відкрити \"%s\"" @@ -156,20 +156,20 @@ msgstr "Не вдається відкрити \"%s\": %s" #. display an error message #: ../thunar/thunar-application.c:1633 #: ../thunar/thunar-properties-dialog.c:731 -#: ../thunar/thunar-standard-view.c:2773 ../thunar/thunar-tree-view.c:1927 +#: ../thunar/thunar-standard-view.c:2853 ../thunar/thunar-tree-view.c:1959 #, c-format msgid "Failed to rename \"%s\"" msgstr "Не вдається перейменувати \"%s\"" #: ../thunar/thunar-application.c:1735 -#: ../thunar/thunar-location-buttons.c:1339 -#: ../thunar/thunar-standard-view.c:2324 ../thunar/thunar-tree-view.c:1789 +#: ../thunar/thunar-location-buttons.c:1347 +#: ../thunar/thunar-standard-view.c:2378 ../thunar/thunar-tree-view.c:1821 msgid "New Folder" msgstr "Нова тека" #: ../thunar/thunar-application.c:1736 -#: ../thunar/thunar-location-buttons.c:1340 -#: ../thunar/thunar-standard-view.c:2325 ../thunar/thunar-tree-view.c:1790 +#: ../thunar/thunar-location-buttons.c:1348 +#: ../thunar/thunar-standard-view.c:2379 ../thunar/thunar-tree-view.c:1822 msgid "Create New Folder" msgstr "Створити нову теку" @@ -182,7 +182,7 @@ msgid "Create New File" msgstr "Створити новий файл" #. generate a title for the create dialog -#: ../thunar/thunar-application.c:1798 ../thunar/thunar-standard-view.c:2369 +#: ../thunar/thunar-application.c:1798 ../thunar/thunar-standard-view.c:2425 #, c-format msgid "Create Document from template \"%s\"" msgstr "Створити документ з шаблону \"%s\"" @@ -224,6 +224,7 @@ msgid_plural "" msgstr[0] "Ви дійсно впевнені у бажанні назавжди\nвидалити %u виділений файл?" msgstr[1] "Ви дійсно впевнені у бажанні назавжди\nвидалити %u виділених файлів?" msgstr[2] "Ви дійсно бажаєте остаточно\nостаточно видалити %u виділених файлів?" +msgstr[3] "Ви дійсно бажаєте остаточно\nостаточно видалити %u виділених файлів?" #. add the "Cancel" button #. append the cancel item @@ -233,16 +234,16 @@ msgstr[2
[Xfce4-commits] [xfce/thunar] branch master updated (0c1d9d6 -> 858fff1)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository xfce/thunar. from 0c1d9d6 I18n: Update translation he (100%). new 858fff1 I18n: Update translation uk (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/uk.po | 739 +-- 1 file changed, 385 insertions(+), 354 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] 01/01: I18n: Update translation uk (100%).
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/exo. commit cdeeb186ef1a630b586319758a955235479bf057 Author: Yarema aka Knedlyk Date: Sat Jun 30 18:30:03 2018 +0200 I18n: Update translation uk (100%). 299 translated messages. Transifex (https://www.transifex.com/xfce/public/). --- po/uk.po | 98 +--- 1 file changed, 51 insertions(+), 47 deletions(-) diff --git a/po/uk.po b/po/uk.po index f9386b5..6b3435e 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,20 +4,20 @@ # # Translators: # Dmitry Nikitin , 2008 -# Yarema aka Knedlyk , 2015-2017 +# Yarema aka Knedlyk , 2015-2018 msgid "" 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-09-19 18:02+\n" +"POT-Creation-Date: 2018-06-07 06:30+0200\n" +"PO-Revision-Date: 2018-06-30 11:24+\n" "Last-Translator: Yarema aka Knedlyk \n" "Language-Team: Ukrainian (http://www.transifex.com/xfce/exo/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" +"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" #: ../exo/exo-cell-renderer-ellipsized-text.c:131 #: ../exo/exo-cell-renderer-icon.c:160 @@ -172,26 +172,26 @@ msgstr "Емблеми" msgid "Emoticons" msgstr "Смайли" -#. EXO_ICON_CHOOSER_CONTEXT_INTERNATIONAL -#: ../exo/exo-icon-chooser-dialog.c:119 -msgid "International Denominations" -msgstr "Міжнародні назви" - #. EXO_ICON_CHOOSER_CONTEXT_MIME_TYPES -#: ../exo/exo-icon-chooser-dialog.c:121 +#: ../exo/exo-icon-chooser-dialog.c:119 msgid "File Type Icons" msgstr "Значки типів файлів" #. EXO_ICON_CHOOSER_CONTEXT_PLACES -#: ../exo/exo-icon-chooser-dialog.c:123 +#: ../exo/exo-icon-chooser-dialog.c:121 msgid "Location Icons" msgstr "Значки місцезнаходження" #. EXO_ICON_CHOOSER_CONTEXT_STATUS -#: ../exo/exo-icon-chooser-dialog.c:125 +#: ../exo/exo-icon-chooser-dialog.c:123 msgid "Status Icons" msgstr "Значки статусу" +#. EXO_ICON_CHOOSER_CONTEXT_STOCK +#: ../exo/exo-icon-chooser-dialog.c:125 +msgid "Stock Icons" +msgstr "Типові значки" + #. EXO_ICON_CHOOSER_CONTEXT_OTHER #: ../exo/exo-icon-chooser-dialog.c:127 msgid "Uncategorized Icons" @@ -563,44 +563,44 @@ msgstr "Вибрати програму" #: ../exo-desktop-item-edit/exo-die-editor.c:594 #: ../exo-desktop-item-edit/exo-die-editor.c:638 #: ../exo-desktop-item-edit/main.c:326 ../exo-desktop-item-edit/main.c:517 -#: ../exo-helper/exo-helper-chooser.c:382 -#: ../exo-helper/exo-helper-chooser.c:527 +#: ../exo-helper/exo-helper-chooser.c:395 +#: ../exo-helper/exo-helper-chooser.c:540 #: ../exo-helper/exo-helper-launcher-dialog.c:109 msgid "_Cancel" msgstr "_Скасувати" #: ../exo-desktop-item-edit/exo-die-command-entry.c:261 -#: ../exo-helper/exo-helper-chooser.c:383 +#: ../exo-helper/exo-helper-chooser.c:396 msgid "_Open" msgstr "_Відкрити" #: ../exo-desktop-item-edit/exo-die-command-entry.c:266 -#: ../exo-helper/exo-helper-chooser.c:389 +#: ../exo-helper/exo-helper-chooser.c:402 msgid "All Files" msgstr "Всі файли" #: ../exo-desktop-item-edit/exo-die-command-entry.c:271 -#: ../exo-helper/exo-helper-chooser.c:394 +#: ../exo-helper/exo-helper-chooser.c:407 msgid "Executable Files" msgstr "Виконувані файли" #: ../exo-desktop-item-edit/exo-die-command-entry.c:286 -#: ../exo-helper/exo-helper-chooser.c:409 +#: ../exo-helper/exo-helper-chooser.c:422 msgid "Perl Scripts" msgstr "Сценарії Perl" #: ../exo-desktop-item-edit/exo-die-command-entry.c:292 -#: ../exo-helper/exo-helper-chooser.c:415 +#: ../exo-helper/exo-helper-chooser.c:428 msgid "Python Scripts" msgstr "Сценарії Python" #: ../exo-desktop-item-edit/exo-die-command-entry.c:298 -#: ../exo-helper/exo-helper-chooser.c:421 +#: ../exo-helper/exo-helper-chooser.c:434 msgid "Ruby Scripts" msgstr "Сценарії Ruby" #: ../exo-desktop-item-edit/exo-die-command-entry.c:304 -#: ../exo-helper/exo-helper-chooser.c:427 +#: ../exo-helper/exo-helper-chooser.c:440 msgid "Shell Scripts" msgstr "Сценарії Shell" @@ -691,7 +691,7 @@ msgstr "Виберіть значок" #: ../exo-desktop-item-edit/exo-die-editor.c:595 #: ../exo-desktop-item-edit/exo-die-editor.c:639 -#: ../exo-helper/exo-helper-chooser.c:528 +#: ../exo-helper/exo-helper-chooser.c:541 #: ../exo-helper/exo-helper-launcher-dialog.c:110 msgid "_OK" msgstr "_ОК" @@ -910,80 +910,80
[Xfce4-commits] [xfce/exo] branch master updated (accb025 -> cdeeb18)
This is an automated email from the git hooks/post-receive script. t r a n s i f e x p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository xfce/exo. from accb025 I18n: Update translation sr (100%). new cdeeb18 I18n: Update translation uk (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/uk.po | 98 +--- 1 file changed, 51 insertions(+), 47 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/catfish] 01/01: Save window placement. Revert to safe defaults if window size is greater than screen size (bug #14504)
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository apps/catfish.
commit 9be582142ac10ef9d09e3867a5d5d79a9df005fa
Author: Sean Davis
Date: Sat Jun 30 08:39:46 2018 -0400
Save window placement. Revert to safe defaults if window size is greater
than screen size (bug #14504)
---
catfish/CatfishWindow.py | 29 ++
catfish_lib/CatfishSettings.py | 8 +++--
catfish_lib/Window.py | 7 -
data/ui/CatfishWindow.ui | 1 +
po/catfish.pot | 68 +-
5 files changed, 75 insertions(+), 38 deletions(-)
diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
index aa50b33..15ab6d6 100644
--- a/catfish/CatfishWindow.py
+++ b/catfish/CatfishWindow.py
@@ -265,6 +265,25 @@ class CatfishWindow(Window):
paned.set_property('height_request',
self.settings.get_setting('window-height'))
paned.set_property('width_request',
self.settings.get_setting('window-width'))
+window_width = self.settings.get_setting('window-width')
+window_height = self.settings.get_setting('window-height')
+window_x = self.settings.get_setting('window-x')
+window_y = self.settings.get_setting('window-y')
+(screen_width, screen_height) = self.get_screen_size()
+(display_width, display_height) = self.get_display_size()
+
+if (window_height > screen_height or window_width > screen_width):
+window_width = min(display_width, 650)
+window_height = min(display_height, 470)
+
+paned.set_property('height_request', window_height)
+paned.set_property('width_request', window_width)
+
+if (window_x >= 0 and window_y >= 0):
+if (window_x + window_width <= screen_width) and \
+ (window_y + window_height <= screen_height):
+self.move(window_x, window_y)
+
self.refresh_search_entry()
filetype_filters = builder.get_object("filetype_options")
@@ -292,6 +311,16 @@ class CatfishWindow(Window):
self.thumbnailer = Thumbnailer.Thumbnailer()
+def get_screen_size(self):
+s = Gdk.Screen.get_default()
+return (s.get_width(), s.get_height())
+
+def get_display_size(self):
+s = self.get_screen()
+m = s.get_monitor_at_window(s.get_active_window())
+monitor = s.get_monitor_geometry(m)
+return (monitor.width, monitor.height)
+
def on_calendar_day_changed(self, widget):
start_calendar = self.builder.get_named_object(
"dialogs.date.start_calendar")
diff --git a/catfish_lib/CatfishSettings.py b/catfish_lib/CatfishSettings.py
index 0528be8..f1b0626 100644
--- a/catfish_lib/CatfishSettings.py
+++ b/catfish_lib/CatfishSettings.py
@@ -24,8 +24,10 @@ default_settings = {
'use-headerbar': True,
'show-hidden-files': False,
'show-sidebar': False,
-'window-width': 760,
-'window-height': 520
+'window-width': 650,
+'window-height': 470,
+'window-x': -1,
+'window-y': -1
}
@@ -47,7 +49,7 @@ class CatfishSettings:
def get_setting(self, key):
"""Return current setting for specified key."""
if key in self.settings:
-if (key in ['window-height', 'window-width']):
+if (key.startswith('window')):
return int(self.settings[key])
return self.settings[key]
else:
diff --git a/catfish_lib/Window.py b/catfish_lib/Window.py
index 1b7ef02..61cb005 100644
--- a/catfish_lib/Window.py
+++ b/catfish_lib/Window.py
@@ -343,4 +343,9 @@ class Window(Gtk.Window):
self.settings.set_setting('window-height', allocation.height)
self.settings.set_setting('window-width', allocation.width)
paned.set_property('height_request', -1)
-paned.set_property('width_request', -1)
\ No newline at end of file
+paned.set_property('width_request', -1)
+
+def on_catfish_window_configure_event(self, widget, event):
+pos = self.get_position()
+self.settings.set_setting('window-x', pos.root_x)
+self.settings.set_setting('window-y', pos.root_y)
\ No newline at end of file
diff --git a/data/ui/CatfishWindow.ui b/data/ui/CatfishWindow.ui
index 4b5f940..363ab2d 100644
--- a/data/ui/CatfishWindow.ui
+++ b/data/ui/CatfishWindow.ui
@@ -468,6 +468,7 @@
Catfish
center
catfish
+
diff --git a/po/catfish.pot b/po/catfish.pot
index 6a03759..3ec8ea0 100644
--- a/po/catfish.pot
+++ b/po/catfish.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 07:36-0400\n"
+"POT-Creation-Date: 2018-06-30 08:38-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last
[Xfce4-commits] [apps/catfish] branch master updated (ccf1702 -> 9be5821)
This is an automated email from the git hooks/post-receive script. b l u e s a b r e p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/catfish. from ccf1702 Remember window size (bug #14504) new 9be5821 Save window placement. Revert to safe defaults if window size is greater than screen size (bug #14504) 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: catfish/CatfishWindow.py | 29 ++ catfish_lib/CatfishSettings.py | 8 +++-- catfish_lib/Window.py | 7 - data/ui/CatfishWindow.ui | 1 + po/catfish.pot | 68 +- 5 files changed, 75 insertions(+), 38 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/catfish] 01/01: Remember window size (bug #14504)
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository apps/catfish.
commit ccf170233fb9fb013e8c4f93efd5a6710b5ed6e5
Author: Sean Davis
Date: Sat Jun 30 07:38:34 2018 -0400
Remember window size (bug #14504)
---
catfish/CatfishWindow.py | 4 +++
catfish_lib/CatfishSettings.py | 6 +++-
catfish_lib/Window.py | 9 ++
data/ui/CatfishWindow.ui | 14 +
po/catfish.pot | 70 +-
5 files changed, 61 insertions(+), 42 deletions(-)
diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
index a218a84..aa50b33 100644
--- a/catfish/CatfishWindow.py
+++ b/catfish/CatfishWindow.py
@@ -261,6 +261,10 @@ class CatfishWindow(Window):
self.rows = []
self.settings = CatfishSettings.CatfishSettings()
+paned = builder.get_named_object("window.paned")
+paned.set_property('height_request',
self.settings.get_setting('window-height'))
+paned.set_property('width_request',
self.settings.get_setting('window-width'))
+
self.refresh_search_entry()
filetype_filters = builder.get_object("filetype_options")
diff --git a/catfish_lib/CatfishSettings.py b/catfish_lib/CatfishSettings.py
index 597c929..0528be8 100644
--- a/catfish_lib/CatfishSettings.py
+++ b/catfish_lib/CatfishSettings.py
@@ -23,7 +23,9 @@ default_settings_file = os.path.join(os.getenv('HOME'),
default_settings = {
'use-headerbar': True,
'show-hidden-files': False,
-'show-sidebar': False
+'show-sidebar': False,
+'window-width': 760,
+'window-height': 520
}
@@ -45,6 +47,8 @@ class CatfishSettings:
def get_setting(self, key):
"""Return current setting for specified key."""
if key in self.settings:
+if (key in ['window-height', 'window-width']):
+return int(self.settings[key])
return self.settings[key]
else:
return None
diff --git a/catfish_lib/Window.py b/catfish_lib/Window.py
index f5d17b5..1b7ef02 100644
--- a/catfish_lib/Window.py
+++ b/catfish_lib/Window.py
@@ -33,6 +33,7 @@ __builder__ = {
"window": {
"main": "Catfish",
"sidebar": "catfish_window_sidebar",
+"paned": "catfish_window_paned"
},
# Toolbar
@@ -335,3 +336,11 @@ class Window(Gtk.Window):
keys = self.get_keys_from_event(event)
self.remove_keys(keys)
return False
+
+def on_catfish_window_size_allocate(self, widget, allocation):
+paned =self.builder.get_named_object("window.paned")
+allocation = paned.get_allocation()
+self.settings.set_setting('window-height', allocation.height)
+self.settings.set_setting('window-width', allocation.width)
+paned.set_property('height_request', -1)
+paned.set_property('width_request', -1)
\ No newline at end of file
diff --git a/data/ui/CatfishWindow.ui b/data/ui/CatfishWindow.ui
index 79e8417..4b5f940 100644
--- a/data/ui/CatfishWindow.ui
+++ b/data/ui/CatfishWindow.ui
@@ -1,5 +1,5 @@
-
+
@@ -467,13 +467,15 @@
False
Catfish
center
-760
-520
catfish
+
+
+
+
True
False
@@ -510,9 +512,6 @@
0
-
- infobar_update
-
False
@@ -1318,6 +1317,9 @@
dialog
Catfish
+
+
+
False
diff --git a/po/catfish.pot b/po/catfish.pot
index be51d44..6a03759 100644
--- a/po/catfish.pot
+++ b/po/catfish.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-29 23:08-0400\n"
+"POT-Creation-Date: 2018-06-30 07:36-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../catfish.desktop.in.h:1 ../data/ui/CatfishWindow.ui.h:28
-#: ../catfish/CatfishWindow.py:632
+#: ../catfish/CatfishWindow.py:636
msgid "Catfish File Search"
msgstr ""
@@ -121,7 +121,7 @@ msgstr ""
msgid "End Date"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:23 ../catfish_lib/Window.py:216
+#: ../data/ui/CatfishWindow.ui.h:23 ../catfish_lib/Window.py:217
msgid "Catfish"
msgstr ""
@@ -137,7 +137,7 @@ msgstr ""
msgid "File Type"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1096
+#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1100
msgid "Modified"
msgstr ""
@@ -277,144 +277,144 @@ msgstr ""
msgid "Never"
msgstr ""
-#: ../catfish/CatfishWindow.py:600
+#: ../catfish/CatfishWindow.py:6
[Xfce4-commits] [apps/catfish] branch master updated (741e4c5 -> ccf1702)
This is an automated email from the git hooks/post-receive script. b l u e s a b r e p u s h e d a c h a n g e t o b r a n c h m a s t e r in repository apps/catfish. from 741e4c5 Handle exceptions encountered while opening settings (bug #14491) new ccf1702 Remember window size (bug #14504) 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: catfish/CatfishWindow.py | 4 +++ catfish_lib/CatfishSettings.py | 6 +++- catfish_lib/Window.py | 9 ++ data/ui/CatfishWindow.ui | 14 + po/catfish.pot | 70 +- 5 files changed, 61 insertions(+), 42 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
