[Xfce4-commits] [apps/catfish] 01/01: Combine 3 strings into 1 to help translators (bug #15596)
noreply at xfce.org
noreply at xfce.org
Sat Aug 24 13:39:51 CEST 2019
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 5c295e84757dc49d7cfb249311e53eafb5cccddb
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sat Aug 24 07:39:43 2019 -0400
Combine 3 strings into 1 to help translators (bug #15596)
---
ChangeLog | 4 +
catfish/CatfishWindow.py | 32 +++++-
data/ui/CatfishWindow.ui | 55 ++--------
po/catfish.pot | 270 ++++++++++-------------------------------------
4 files changed, 100 insertions(+), 261 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ee21035..50fbf83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+v1.4.10 (UNRELEASED):
+ + Translations:
+ - Combine 3 strings into 1 to help translators (Xfce #15596)
+
v1.4.9:
+ Bug Fixes:
- Fix path exclusions (Debian #926850)
diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
index ca6170a..aecec5c 100644
--- a/catfish/CatfishWindow.py
+++ b/catfish/CatfishWindow.py
@@ -324,6 +324,30 @@ class CatfishWindow(Window):
self.app_menu_event = False
self.thumbnailer = Thumbnailer.Thumbnailer()
+ self.configure_welcome_area(builder)
+
+ def configure_welcome_area(self, builder):
+ welcome_area = builder.get_object("welcome_area")
+ content = _("Enter your query above to find your files\n"
+ "or click the %s icon for more options.")
+ for line in content.split("\n"):
+ if "%s" in line:
+ row = Gtk.Box.new(Gtk.Orientation.HORIZONTAL, 0)
+ parts = line.split("%s")
+ if len(parts[0].strip()) > 0:
+ label = Gtk.Label.new(parts[0])
+ row.pack_start(label, False, False, 0)
+ image = Gtk.Image.new_from_icon_name("emblem-system-symbolic", Gtk.IconSize.BUTTON)
+ image.set_property("use-fallback", True)
+ row.pack_start(image, False, False, 0)
+ if len(parts[1].strip()) > 0:
+ label = Gtk.Label.new(parts[1])
+ row.pack_start(label, False, False, 0)
+ else:
+ row = Gtk.Label.new(line)
+ row.set_halign(Gtk.Align.CENTER)
+ welcome_area.pack_start(row, False, False, 0)
+ welcome_area.show_all()
def get_screen_size(self):
s = Gdk.Screen.get_default()
@@ -1547,9 +1571,10 @@ class CatfishWindow(Window):
self.builder.get_object("splash").show()
self.builder.get_object(
"splash_title").set_text(_("No files found."))
- self.builder.get_object("splash_subtitle").set_text(
+ self.builder.get_object("splash_status").set_text(
_("Try making your search less specific\n"
"or try another directory."))
+ self.builder.get_object("splash_status").show()
else:
self.builder.get_object("splash").hide()
self.builder.get_object("results_scrolledwindow").show()
@@ -1671,9 +1696,10 @@ class CatfishWindow(Window):
self.builder.get_object("results_scrolledwindow").hide()
self.builder.get_object("splash").show()
self.builder.get_object("splash_title").set_text(_("Searching..."))
- self.builder.get_object("splash_subtitle").set_text(
+ self.builder.get_object("splash_status").set_text(
_("Results will be displayed as soon as they are found."))
- self.builder.get_object("splash_hide").hide()
+ self.builder.get_object("splash_status").show()
+ self.builder.get_object("welcome_area").hide()
show_results = False
self.get_window().set_cursor(Gdk.Cursor(Gdk.CursorType.WATCH))
diff --git a/data/ui/CatfishWindow.ui b/data/ui/CatfishWindow.ui
index c5ae3b6..f139895 100644
--- a/data/ui/CatfishWindow.ui
+++ b/data/ui/CatfishWindow.ui
@@ -901,18 +901,15 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkBox" id="message_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="splash_subtitle">
- <property name="visible">True</property>
+ <object class="GtkLabel" id="splash_status">
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="Full text: Enter your query above to find your files or click the [icon] icon for more options.">Enter your query above to find your files</property>
+ <property name="label" translatable="yes">Results will be displayed as soon as they are found.</property>
<property name="justify">center</property>
- <property name="yalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -921,53 +918,19 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="splash_hide">
+ <object class="GtkBox" id="welcome_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="Full text: Enter your query above to find your files or click the [icon] icon for more options.">or click the </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixel_size">16</property>
- <property name="icon_name">emblem-system-symbolic</property>
- <property name="use_fallback">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="Full text: Enter your query above to find your files or click the [icon] icon for more options."> icon for more options.</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
+ <placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
diff --git a/po/catfish.pot b/po/catfish.pot
index 742c2aa..df1bbe9 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: 2019-08-11 13:53-0400\n"
+"POT-Creation-Date: 2019-08-24 07:35-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../catfish.desktop.in.h:1 ../data/ui/CatfishWindow.ui.h:28
-#: ../catfish/CatfishWindow.py:669
+#: ../org.xfce.Catfish.desktop.in.h:1 ../data/ui/CatfishWindow.ui.h:28
+#: ../catfish/CatfishWindow.py:707
msgid "Catfish File Search"
msgstr ""
@@ -137,104 +137,79 @@ msgstr ""
msgid "File Type"
msgstr ""
-<<<<<<< HEAD
-#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1215
-=======
-#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1142
->>>>>>> 761eaffa... ../0001.patch
+#: ../data/ui/CatfishWindow.ui.h:27 ../catfish/CatfishWindow.py:1249
msgid "Modified"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:29
-msgctxt ""
-"Full text: Enter your query above to find your files or click the [icon] "
-"icon for more options."
-msgid "Enter your query above to find your files"
+#: ../data/ui/CatfishWindow.ui.h:29 ../catfish/CatfishWindow.py:1700
+msgid "Results will be displayed as soon as they are found."
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:30
-msgctxt ""
-"Full text: Enter your query above to find your files or click the [icon] "
-"icon for more options."
-msgid "or click the "
+msgid "Select a Directory"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:31
-msgctxt ""
-"Full text: Enter your query above to find your files or click the [icon] "
-"icon for more options."
-msgid " icon for more options."
+msgid "Search for files"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:32
-msgid "Select a Directory"
+msgid "Compact List"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:33
-msgid "Search for files"
+msgid "Thumbnails"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:34
-msgid "Compact List"
+msgid "Show _Hidden Files"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:35
-msgid "Thumbnails"
+msgid "Search File _Contents"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:36
-msgid "Show _Hidden Files"
+msgid "_Exact Match"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:37
-msgid "Search File _Contents"
+msgid "Show _Sidebar"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:38
-msgid "_Exact Match"
+msgid "Close _on Selection"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:39
-<<<<<<< HEAD
-msgid "Show _Sidebar"
-msgstr ""
-
-#: ../data/ui/CatfishWindow.ui.h:40
msgid "_Update Search Index..."
-=======
-msgid "Close _on Selection"
msgstr ""
#: ../data/ui/CatfishWindow.ui.h:40
-msgid "_Update Search Index…"
->>>>>>> 761eaffa... ../0001.patch
-msgstr ""
-
-#: ../data/ui/CatfishWindow.ui.h:41
msgid "_About"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:42
+#: ../data/ui/CatfishWindow.ui.h:41
msgid "Update Search Database"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:43
+#: ../data/ui/CatfishWindow.ui.h:42
msgid "Unlock"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:44
+#: ../data/ui/CatfishWindow.ui.h:43
msgid "<b>Database:</b>"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:45
+#: ../data/ui/CatfishWindow.ui.h:44
msgid "<b>Updated:</b>"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:46
+#: ../data/ui/CatfishWindow.ui.h:45
msgid "<big><b>Update Search Database</b></big>"
msgstr ""
-#: ../data/ui/CatfishWindow.ui.h:47
+#: ../data/ui/CatfishWindow.ui.h:46
msgid ""
"For faster search results, the search database needs to be refreshed.\n"
"This action requires administrative rights."
@@ -295,284 +270,155 @@ msgstr ""
msgid "%s (invalid encoding)"
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:249
+#: ../catfish/CatfishWindow.py:251
msgid "Unknown"
msgstr ""
-#: ../catfish/CatfishWindow.py:253
+#: ../catfish/CatfishWindow.py:255
msgid "Never"
msgstr ""
-#: ../catfish/CatfishWindow.py:647
-msgid "An error occurred while updating the database."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:649
-msgid "Authentication failed."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:655
-msgid "Authentication cancelled."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:661
-=======
-#: ../catfish/CatfishWindow.py:239
-msgid "Unknown"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:243
-msgid "Never"
+#: ../catfish/CatfishWindow.py:331
+#, python-format
+msgid ""
+"Enter your query above to find your files\n"
+"or click the %s icon for more options."
msgstr ""
-#: ../catfish/CatfishWindow.py:637
+#: ../catfish/CatfishWindow.py:675
msgid "An error occurred while updating the database."
msgstr ""
-#: ../catfish/CatfishWindow.py:639
+#: ../catfish/CatfishWindow.py:677
msgid "Authentication failed."
msgstr ""
-#: ../catfish/CatfishWindow.py:645
+#: ../catfish/CatfishWindow.py:683
msgid "Authentication cancelled."
msgstr ""
-#: ../catfish/CatfishWindow.py:651
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:689
msgid "Search database updated successfully."
msgstr ""
#. Set the dialog status to running.
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:736
+#: ../catfish/CatfishWindow.py:764
msgid "Updating..."
msgstr ""
-#: ../catfish/CatfishWindow.py:770
+#: ../catfish/CatfishWindow.py:798
msgid "Stop Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:771
-=======
-#: ../catfish/CatfishWindow.py:726
-msgid "Updating..."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:760
-msgid "Stop Search"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:761
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:799
msgid ""
"Search is in progress...\n"
"Press the cancel button or the Escape key to stop."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:780
-msgid "Begin Search"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1035
-=======
-#: ../catfish/CatfishWindow.py:770
+#: ../catfish/CatfishWindow.py:808
msgid "Begin Search"
msgstr ""
-#: ../catfish/CatfishWindow.py:968
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1069
#, python-format
msgid "\"%s\" could not be opened."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1087
-=======
-#: ../catfish/CatfishWindow.py:1014
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1121
#, python-format
msgid "\"%s\" could not be saved."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1104
-=======
-#: ../catfish/CatfishWindow.py:1031
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1138
#, python-format
msgid "\"%s\" could not be deleted."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1144
-=======
-#: ../catfish/CatfishWindow.py:1071
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1178
#, python-format
msgid "Save \"%s\" as..."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1179
-=======
-#: ../catfish/CatfishWindow.py:1106
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1213
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete \"%s\"?"
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1183
-=======
-#: ../catfish/CatfishWindow.py:1110
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1217
#, python-format
msgid ""
"Are you sure that you want to \n"
"permanently delete the %i selected files?"
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1186
-msgid "If you delete a file, it is permanently lost."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1209
-msgid "Filename"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1211
-msgid "Size"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1213
-msgid "Location"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1225
-msgid "Preview"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1233
-msgid "Details"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1456
-msgid "Today"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1458
-msgid "Yesterday"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1539
-msgid "No files found."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1541
-=======
-#: ../catfish/CatfishWindow.py:1113
+#: ../catfish/CatfishWindow.py:1220
msgid "If you delete a file, it is permanently lost."
msgstr ""
-#: ../catfish/CatfishWindow.py:1136
+#: ../catfish/CatfishWindow.py:1243
msgid "Filename"
msgstr ""
-#: ../catfish/CatfishWindow.py:1138
+#: ../catfish/CatfishWindow.py:1245
msgid "Size"
msgstr ""
-#: ../catfish/CatfishWindow.py:1140
+#: ../catfish/CatfishWindow.py:1247
msgid "Location"
msgstr ""
-#: ../catfish/CatfishWindow.py:1152
+#: ../catfish/CatfishWindow.py:1259
msgid "Preview"
msgstr ""
-#: ../catfish/CatfishWindow.py:1160
+#: ../catfish/CatfishWindow.py:1267
msgid "Details"
msgstr ""
-#: ../catfish/CatfishWindow.py:1379
+#: ../catfish/CatfishWindow.py:1490
msgid "Today"
msgstr ""
-#: ../catfish/CatfishWindow.py:1381
+#: ../catfish/CatfishWindow.py:1492
msgid "Yesterday"
msgstr ""
-#: ../catfish/CatfishWindow.py:1462
+#: ../catfish/CatfishWindow.py:1573
msgid "No files found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1464
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1575
msgid ""
"Try making your search less specific\n"
"or try another directory."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1547
-msgid "1 file found."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1549
-=======
-#: ../catfish/CatfishWindow.py:1470
+#: ../catfish/CatfishWindow.py:1582
msgid "1 file found."
msgstr ""
-#: ../catfish/CatfishWindow.py:1472
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1584
#, python-format
msgid "%i files found."
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1555
+#: ../catfish/CatfishWindow.py:1590
msgid "bytes"
msgstr ""
-#: ../catfish/CatfishWindow.py:1663 ../catfish/CatfishWindow.py:1672
+#: ../catfish/CatfishWindow.py:1698 ../catfish/CatfishWindow.py:1708
msgid "Searching..."
msgstr ""
-#: ../catfish/CatfishWindow.py:1665
-msgid "Results will be displayed as soon as they are found."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1670
-=======
-#: ../catfish/CatfishWindow.py:1478
-msgid "bytes"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1586 ../catfish/CatfishWindow.py:1595
-msgid "Searching…"
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1588
-msgid "Results will be displayed as soon as they are found."
-msgstr ""
-
-#: ../catfish/CatfishWindow.py:1593
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1706
#, python-format
msgid "Searching for \"%s\""
msgstr ""
-<<<<<<< HEAD
-#: ../catfish/CatfishWindow.py:1760
-=======
-#: ../catfish/CatfishWindow.py:1682
->>>>>>> 761eaffa... ../0001.patch
+#: ../catfish/CatfishWindow.py:1796
#, python-format
msgid "Search results for \"%s\""
msgstr ""
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list