Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/gnunn1/tilix
Browse files Browse the repository at this point in the history
  • Loading branch information
gnunn1 committed Dec 17, 2017
2 parents 7e4b9ba + 2e3f2aa commit 1034c18
Show file tree
Hide file tree
Showing 4 changed files with 288 additions and 277 deletions.
11 changes: 7 additions & 4 deletions data/man/po/nb_NO.man.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2017-10-06 08:39-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"PO-Revision-Date: 2017-12-10 01:49+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Norwegian Bokmål "
"<https://hosted.weblate.org/projects/tilix/manpage/nb_NO/>\n"
"Language: nb_NO\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.18-dev\n"

#. type: TH
#: ./data/man/tilix:3
Expand Down Expand Up @@ -309,7 +312,7 @@ msgstr ""
#. type: Plain text
#: ./data/man/tilix:75
msgid "None"
msgstr ""
msgstr "Ingen"

#. type: SH
#: ./data/man/tilix:75
Expand Down
34 changes: 14 additions & 20 deletions po/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ msgstr ""
"Project-Id-Version: Terminix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-10-06 08:39-0400\n"
"PO-Revision-Date: 2017-07-23 21:50+0000\n"
"Last-Translator: monolifed <monolifed@gmail.com>\n"
"Language-Team: English <https://hosted.weblate.org/projects/tilix/"
"translations/en/>\n"
"PO-Revision-Date: 2017-12-12 20:07+0000\n"
"Last-Translator: Aaro Asikainen <marjapulla@gmail.com>\n"
"Language-Team: English "
"<https://hosted.weblate.org/projects/tilix/translations/en/>\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.16-dev\n"
"X-Generator: Weblate 2.18-dev\n"

#: source/app.d:133
#, c-format
Expand Down Expand Up @@ -200,7 +200,6 @@ msgid "Tilix"
msgstr "Tilix"

#: source/gx/tilix/appwindow.d:2072
#, fuzzy
msgid "Close session"
msgstr "Close Session"

Expand Down Expand Up @@ -299,7 +298,7 @@ msgstr "Read-Only"

#: source/gx/tilix/terminal/terminal.d:412
msgid "New output"
msgstr ""
msgstr "New output"

#: source/gx/tilix/terminal/terminal.d:418
#: source/gx/tilix/prefeditor/profileeditor.d:289
Expand Down Expand Up @@ -347,7 +346,7 @@ msgstr "Add Bookmark..."

#: source/gx/tilix/terminal/terminal.d:804
msgid "Assistants"
msgstr ""
msgstr "Assistants"

#: source/gx/tilix/terminal/terminal.d:805
#: source/gx/tilix/prefeditor/prefdialog.d:278
Expand Down Expand Up @@ -1232,9 +1231,8 @@ msgstr "Small"

#: source/gx/tilix/prefeditor/prefdialog.d:1055
#: source/gx/tilix/prefeditor/prefdialog.d:1249
#, fuzzy
msgid "Tab position"
msgstr "Badge position"
msgstr "Tab position"

#: source/gx/tilix/prefeditor/prefdialog.d:1056
#: source/gx/tilix/prefeditor/prefdialog.d:1243
Expand All @@ -1251,12 +1249,12 @@ msgstr "Right"
#: source/gx/tilix/prefeditor/prefdialog.d:1056
#: source/gx/tilix/prefeditor/prefdialog.d:1250
msgid "Top"
msgstr ""
msgstr "Top"

#: source/gx/tilix/prefeditor/prefdialog.d:1056
#: source/gx/tilix/prefeditor/prefdialog.d:1250
msgid "Bottom"
msgstr ""
msgstr "Bottom"

#: source/gx/tilix/prefeditor/prefdialog.d:1062
msgid "Theme variant"
Expand Down Expand Up @@ -1332,9 +1330,8 @@ msgid "Use overlay scrollbars (Application restart required)"
msgstr "Use overlay scrollbars (Application restart required)"

#: source/gx/tilix/prefeditor/prefdialog.d:1178
#, fuzzy
msgid "Use tabs instead of sidebar (Application restart required)"
msgstr "Use overlay scrollbars (Application restart required)"
msgstr "Use tabs instead of sidebar (Application restart required)"

#: source/gx/tilix/prefeditor/prefdialog.d:1210
msgid "Size"
Expand Down Expand Up @@ -1759,9 +1756,8 @@ msgid "Rows"
msgstr "Rows"

#: source/gx/tilix/constants.d:148
#, fuzzy
msgid "Process"
msgstr "RunProcess"
msgstr "Process"

#: source/gx/tilix/constants.d:190
msgid "Application name"
Expand All @@ -1780,9 +1776,8 @@ msgid "Session number"
msgstr "Session number"

#: source/gx/tilix/constants.d:194
#, fuzzy
msgid "Session count"
msgstr "Session Load"
msgstr "Session count"

#: source/gx/tilix/cmdparams.d:117 source/gx/tilix/cmdparams.d:121
#, c-format
Expand Down Expand Up @@ -2051,9 +2046,8 @@ msgid "Open Remote Tilix"
msgstr "Open Remote Tilix"

#: data/nautilus/open-tilix.py:110
#, fuzzy
msgid "Open Remote Tilix In {}"
msgstr "Open Remote Tilix In"
msgstr "Open Remote Tilix In {}"

#: data/nautilus/open-tilix.py:116
msgid "Open In Tilix"
Expand Down
Loading

0 comments on commit 1034c18

Please sign in to comment.