Merge branch 'master' of github.com:artemanufrij/playmyvideos

artemanufrij · Mar 17, 2018 · 487afd0 · 487afd0
2 parents c76d74a + 22cbdd5
commit 487afd0
Show file tree

Hide file tree

Showing 29 changed files with 126 additions and 76 deletions.
diff --git a/Config.vala.cmake b/Config.vala.cmake
@@ -12,7 +12,7 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//  along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
 namespace Constants {

diff --git a/debian/copyright b/debian/copyright
@@ -18,7 +18,7 @@ License: GPL-3.0+
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

diff --git a/po/nb.po b/po/nb.po
@@ -1,101 +1,151 @@
+# Norwegian Bokmål translation og Cinema.
+# Copyright (C) 2017 Artem Anufrij
+# This file is distributed under the same license as the CINEMA package.
+# Harald H. <[email protected]>, 2018.
+#
 msgid ""
 msgstr ""
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-26 18:02+0100\n"
+"POT-Creation-Date: 2018-03-13 08:31+0100\n"
+"PO-Revision-Date: 2018-03-13 08:48+0100\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"Last-Translator: Harald H. <[email protected]>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nb\n"
 
-#: ../src/Widgets/Box.vala:66 ../src/Widgets/Views/BoxView.vala:59
+#: ../src/Widgets/Box.vala:95 ../src/Widgets/Views/BoxView.vala:62
 msgid "Set new Cover…"
-msgstr ""
+msgstr "Sett nytt omslag ..."
 
-#: ../src/Widgets/VideoTimeLine.vala:148
+#: ../src/Widgets/VideoTimeLine.vala:243
 msgid "Repeat"
-msgstr ""
+msgstr "Gjenta"
 
-#: ../src/Widgets/VideoTimeLine.vala:174
+#: ../src/Widgets/VideoTimeLine.vala:270
 msgid "Track %d (%s)"
-msgstr ""
+msgstr "Spor %d (%s)"
 
-#: ../src/Widgets/VideoTimeLine.vala:194
+#: ../src/Widgets/VideoTimeLine.vala:288
 msgid "disable"
-msgstr ""
+msgstr "deaktiver"
 
-#: ../src/Widgets/VideoTimeLine.vala:207
+#: ../src/Widgets/VideoTimeLine.vala:300
 msgid "Subtitle %d (%s)"
-msgstr ""
+msgstr "Undertekst %d (%s)"
+
+#: ../src/Widgets/Views/Welcome.vala:43
+msgid "Get Some Videos"
+msgstr "Hent noen videoer"
+
+#: ../src/Widgets/Views/Welcome.vala:43
+msgid "Add videos to your library."
+msgstr "Legg til videoer i biblioteket ditt."
 
 #: ../src/Widgets/Views/Welcome.vala:44
 msgid "Change Video Folder"
-msgstr ""
+msgstr "Endre videomappe"
 
 #: ../src/Widgets/Views/Welcome.vala:44
 msgid "Load videos from a folder, a network or an external disk."
-msgstr ""
+msgstr "Last inn videoer fra en mappe, et nettverk eller en ekstern disk."
 
 #: ../src/Widgets/Views/Welcome.vala:45
 msgid "Import Videos"
-msgstr ""
+msgstr "Importer videoer"
 
 #: ../src/Widgets/Views/Welcome.vala:45
 msgid "Import videos from a source into your library."
-msgstr ""
+msgstr "Importer videoer fra en kilde til biblioteket ditt."
+
+#: ../src/Widgets/Views/BoxesView.vala:104
+msgid "No results"
+msgstr "Ingen resultater"
 
-#: ../src/Services/LibraryManager.vala:117
+#: ../src/Widgets/Views/BoxesView.vala:104
+msgid "Try another search"
+msgstr "Prøv med et annet søk"
+
+#: ../src/Services/LibraryManager.vala:170
 msgid "Choose an image…"
-msgstr ""
+msgstr "Velg et bilde ..."
 
-#: ../src/Services/LibraryManager.vala:119
-#: ../src/Services/LibraryManager.vala:140
+#: ../src/Services/LibraryManager.vala:172
+#: ../src/Services/LibraryManager.vala:193
+#: ../src/Services/LibraryManager.vala:215
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
-#: ../src/Services/LibraryManager.vala:120
-#: ../src/Services/LibraryManager.vala:141
+#: ../src/Services/LibraryManager.vala:173
+#: ../src/Services/LibraryManager.vala:194
+#: ../src/Services/LibraryManager.vala:216
 msgid "_Open"
-msgstr ""
+msgstr "_Åpne"
 
-#: ../src/Services/LibraryManager.vala:123
+#: ../src/Services/LibraryManager.vala:176
 msgid "Images"
-msgstr ""
+msgstr "Bilder"
 
-#: ../src/Services/LibraryManager.vala:139
+#: ../src/Services/LibraryManager.vala:192
 msgid "Select a folder."
-msgstr ""
+msgstr "Velg en mappe."
 
-#: ../src/Services/LibraryManager.vala:144
+#: ../src/Services/LibraryManager.vala:197
 msgid "Folder"
-msgstr ""
+msgstr "Mappe"
 
-#: ../src/MainWindow.vala:139 ../src/MainWindow.vala:253
-msgid "Play My Videos"
-msgstr ""
+#: ../src/Services/LibraryManager.vala:213
+msgid "Choose a subtitle file…"
+msgstr "Velg en undertekstfil ..."
 
-#: ../src/MainWindow.vala:151
+#: ../src/Services/LibraryManager.vala:219
+msgid "Subtitles"
+msgstr "Undertekster"
+
+#: ../src/MainWindow.vala:202 ../src/MainWindow.vala:377
+msgid "Cinema"
+msgstr "Cinema"
+
+#: ../src/MainWindow.vala:206
+msgid "Resume playing"
+msgstr "Fortsett avspilling"
+
+#: ../src/MainWindow.vala:224
 msgid "Change Video Folder…"
-msgstr ""
+msgstr "Endre videomappe ..."
 
-#: ../src/MainWindow.vala:160
+#: ../src/MainWindow.vala:234
 msgid "Import Videos…"
-msgstr ""
+msgstr "Importer videoer ..."
 
-#: ../src/MainWindow.vala:168
+#: ../src/MainWindow.vala:243
 msgid "Rescan Library"
-msgstr ""
+msgstr "Skann bibliotek på nytt"
 
-#: ../src/MainWindow.vala:174
+#: ../src/MainWindow.vala:250
 msgid "Preferences"
-msgstr ""
+msgstr "Innstillinger"
 
-#: ../src/MainWindow.vala:192
+#: ../src/MainWindow.vala:269
 msgid "Search Videos"
-msgstr ""
+msgstr "Finn videoer"
 
-#: ../src/MainWindow.vala:198
-msgid "Library"
-msgstr ""
+#: ../src/MainWindow.vala:282
+msgid "Back"
+msgstr "Tilbake"
 
-#: ../src/Dialogs/Preferences.vala:60
+#: ../src/Dialogs/Preferences.vala:61
 msgid "Use Dark Theme"
-msgstr ""
+msgstr "Bruk mørkt tema"
+
+#: ../src/Dialogs/Preferences.vala:69
+msgid "Load Content from The Movie DB"
+msgstr "Last innhold fra The Movie DB"
+
+#: ../src/Dialogs/Preferences.vala:77
+msgid "Save custom Covers in Library folder"
+msgstr "Lagre egendefinerte omslag i bibliotekmappen"
diff --git a/src/Application.vala b/src/Application.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Dialogs/Preferences.vala b/src/Dialogs/Preferences.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Interfaces/Inhibitor.vala b/src/Interfaces/Inhibitor.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Interfaces/MediaKeys.vala b/src/Interfaces/MediaKeys.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Interfaces/Thubnailer.vala b/src/Interfaces/Thubnailer.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Objects/Box.vala b/src/Objects/Box.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Objects/Video.vala b/src/Objects/Video.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Services/DataBaseManager.vala b/src/Services/DataBaseManager.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Services/LibraryManager.vala b/src/Services/LibraryManager.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Services/LocalFilesManager.vala b/src/Services/LocalFilesManager.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Services/MovieDatabaseManager.vala b/src/Services/MovieDatabaseManager.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Settings.vala b/src/Settings.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Utils/MovieDatabase.vala b/src/Utils/MovieDatabase.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Utils/Pixbuf.vala b/src/Utils/Pixbuf.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Utils/Utils.vala b/src/Utils/Utils.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Widgets/Box.vala b/src/Widgets/Box.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Widgets/Playlist.vala b/src/Widgets/Playlist.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Widgets/PreviewPopover.vala b/src/Widgets/PreviewPopover.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer

diff --git a/src/Widgets/SubTitleRow.vala b/src/Widgets/SubTitleRow.vala
@@ -12,7 +12,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  * The Noise authors hereby grant permission for non-GPL compatible
  * GStreamer plugins to be used and distributed together with GStreamer