Skip to content

Commit d5a0800

Browse files
committed
Merge branch 'master' of https://github.com/gnunn1/terminix
2 parents fa2cd22 + 370eee1 commit d5a0800

3 files changed

Lines changed: 15 additions & 22 deletions

File tree

data/nautilus/open-terminix.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from gi.repository import GObject, Gdk, Gio, Gtk, Nautilus
2020

2121
TERMINAL = "terminix"
22-
IS_INSTALLED = bool(call(['which', TERMINAL], stdout=PIPE, stderr=PIPE) == 0)
2322

2423

2524
def open_terminl_in_file(filename):
@@ -33,7 +32,8 @@ class OpenTerminixShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvi
3332

3433
def __init__(self):
3534
self.accel_group = Gtk.AccelGroup()
36-
if IS_INSTALLED:
35+
source = Gio.SettingsSchemaSource.get_default()
36+
if source.lookup("com.gexperts.Terminix.Keybindings", True):
3737
self.gsettings = Gio.Settings.new(
3838
"com.gexperts.Terminix.Keybindings")
3939
self.gsettings.connect("changed", self.bind_shortcut)
@@ -122,8 +122,6 @@ def get_file_items(self, window, files):
122122
item.connect('activate', self.menu_activate_cb, file)
123123
items.append(item)
124124

125-
if not IS_INSTALLED:
126-
items = []
127125
return items
128126

129127
def get_background_items(self, window, file):
@@ -140,7 +138,4 @@ def get_background_items(self, window, file):
140138
tip=_(u'Open Terminix In This Directory'))
141139
item.connect('activate', self.menu_background_activate_cb, file)
142140
items.append(item)
143-
144-
if not IS_INSTALLED:
145-
items = []
146141
return items

po/de.po

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ msgstr ""
33
"Project-Id-Version: German (Terminix)\n"
44
"Report-Msgid-Bugs-To: \n"
55
"POT-Creation-Date: 2017-02-26 09:35-0500\n"
6-
"PO-Revision-Date: 2017-02-17 19:40+0000\n"
6+
"PO-Revision-Date: 2017-02-26 21:21+0000\n"
77
"Last-Translator: Philipp Wolfer <ph.wolfer@gmail.com>\n"
8-
"Language-Team: German <https://hosted.weblate.org/projects/terminix/"
9-
"translations/de/>\n"
8+
"Language-Team: German "
9+
"<https://hosted.weblate.org/projects/terminix/translations/de/>\n"
1010
"Language: de\n"
1111
"MIME-Version: 1.0\n"
1212
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1581,12 +1581,11 @@ msgstr "Hintergrundfarbe für Hervorhebung wählen"
15811581

15821582
#: source/gx/terminix/prefeditor/profileeditor.d:622
15831583
msgid "Bold"
1584-
msgstr ""
1584+
msgstr "Fett"
15851585

15861586
#: source/gx/terminix/prefeditor/profileeditor.d:627
1587-
#, fuzzy
15881587
msgid "Select Bold Color"
1589-
msgstr "Badge-Farbe wählen"
1588+
msgstr "Farbe für fetten Text wählen"
15901589

15911590
#: source/gx/terminix/prefeditor/profileeditor.d:632
15921591
msgid "Dim"

po/ru.po

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ msgstr ""
99
"Project-Id-Version: terminix\n"
1010
"Report-Msgid-Bugs-To: \n"
1111
"POT-Creation-Date: 2017-02-26 09:35-0500\n"
12-
"PO-Revision-Date: 2017-02-17 19:49+0000\n"
12+
"PO-Revision-Date: 2017-02-26 17:37+0000\n"
1313
"Last-Translator: Igor <f2404@yandex.ru>\n"
14-
"Language-Team: Russian <https://hosted.weblate.org/projects/terminix/"
15-
"translations/ru/>\n"
14+
"Language-Team: Russian "
15+
"<https://hosted.weblate.org/projects/terminix/translations/ru/>\n"
1616
"Language: ru\n"
1717
"MIME-Version: 1.0\n"
1818
"Content-Type: text/plain; charset=UTF-8\n"
1919
"Content-Transfer-Encoding: 8bit\n"
20-
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
21-
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
20+
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
21+
"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
2222
"X-Generator: Weblate 2.12-dev\n"
2323

2424
#: source/app.d:133
@@ -205,7 +205,7 @@ msgstr ""
205205

206206
#: source/gx/terminix/constants.d:66
207207
msgid "GTK VTE widget team, Terminix would not be possible without their work"
208-
msgstr "Terminix не был бы возможен без работы команды виджетов GTK VTE"
208+
msgstr "Terminix не был бы возможен без работы команды виджета GTK VTE"
209209

210210
#: source/gx/terminix/constants.d:67
211211
msgid "GtkD for providing such an excellent GTK wrapper"
@@ -1579,12 +1579,11 @@ msgstr "Выбрать цвет фона подсветки терминала"
15791579

15801580
#: source/gx/terminix/prefeditor/profileeditor.d:622
15811581
msgid "Bold"
1582-
msgstr ""
1582+
msgstr "Полужирный"
15831583

15841584
#: source/gx/terminix/prefeditor/profileeditor.d:627
1585-
#, fuzzy
15861585
msgid "Select Bold Color"
1587-
msgstr "Выбрать цвет значка"
1586+
msgstr "Выбрать цвет полужирного текста"
15881587

15891588
#: source/gx/terminix/prefeditor/profileeditor.d:632
15901589
msgid "Dim"

0 commit comments

Comments
 (0)