Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear release team, KDE Plasma 5.8 is an LTS release that I consider fit to be updated in stretch. This particular request is for kscreen 5.8.5. The fixes included in the kscreen 5.8.5 release are: translation updates 3 bug fixes: + Handle nullptr when there is no Primary Output (d79dc2b) + Improve screen resize when running in a vm (96db1a9 d5b9d37) + Avoid setting the modes in disabled outputs (b4b5046) On the Debian side of changes we add the requested upower recommends (#853171) I'm attaching the full debdiff, the gitlogs of the upstream changes and the diff of the debian changes. Currently the version 5:5.8.5-1 is in experimental, and I'll upload the 4:5.8.5-2 version to unstable if this gets approved. Please unblock package kscreen Happy hacking, unblock kscreen/4:5.8.5-2 -- System Information: Debian Release: 9.0 APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, armhf Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Init: systemd (via /run/systemd/system)
diff -Nru kscreen-5.8.4/CMakeLists.txt kscreen-5.8.5/CMakeLists.txt --- kscreen-5.8.4/CMakeLists.txt 2016-11-22 11:13:12.000000000 +0100 +++ kscreen-5.8.5/CMakeLists.txt 2016-12-27 12:25:27.000000000 +0100 @@ -1,5 +1,5 @@ project(KScreen) -set(PROJECT_VERSION "5.8.4") +set(PROJECT_VERSION "5.8.5") cmake_minimum_required(VERSION 2.8.12) diff -Nru kscreen-5.8.4/console/console.cpp kscreen-5.8.5/console/console.cpp --- kscreen-5.8.4/console/console.cpp 2016-11-22 11:10:47.000000000 +0100 +++ kscreen-5.8.5/console/console.cpp 2016-12-27 12:24:43.000000000 +0100 @@ -71,7 +71,12 @@ connect(m_config.data(), &Config::primaryOutputChanged, [&](const OutputPtr &output) { - qDebug() << "New primary output: " << output->id() << output->name(); + if (output) { + qDebug() << "New primary output: " + << output->id() << output->name(); + } else { + qDebug() << "No primary output."; + } }); qDebug() << "Screen:"; diff -Nru kscreen-5.8.4/debian/changelog kscreen-5.8.5/debian/changelog --- kscreen-5.8.4/debian/changelog 2016-11-23 18:35:52.000000000 +0100 +++ kscreen-5.8.5/debian/changelog 2017-03-13 14:20:57.000000000 +0100 @@ -1,3 +1,16 @@ +kscreen (4:5.8.5-2) unstable; urgency=medium + + * Add upower as a recommends. + Thanks to Éter for reporting (Closes: 853171) + + -- Maximiliano Curia <m...@debian.org> Mon, 13 Mar 2017 14:20:57 +0100 + +kscreen (4:5.8.5-1) experimental; urgency=medium + + * New upstream release (5.8.5). + + -- Maximiliano Curia <m...@debian.org> Fri, 30 Dec 2016 18:46:16 +0100 + kscreen (4:5.8.4-1) unstable; urgency=medium * New upstream release (5.8.4) diff -Nru kscreen-5.8.4/debian/control kscreen-5.8.5/debian/control --- kscreen-5.8.4/debian/control 2016-11-23 18:35:52.000000000 +0100 +++ kscreen-5.8.5/debian/control 2017-03-13 14:20:57.000000000 +0100 @@ -33,6 +33,7 @@ qml-module-qtgraphicaleffects, ${misc:Depends}, ${shlibs:Depends} +Recommends: upower Description: KDE monitor hotplug and screen handling KScreen provides multiple monitor support. This support tries to be as smart as possible adapting the behavior of it to each use case diff -Nru kscreen-5.8.4/kcm/kcm_kscreen.desktop.cmake kscreen-5.8.5/kcm/kcm_kscreen.desktop.cmake --- kscreen-5.8.4/kcm/kcm_kscreen.desktop.cmake 2016-11-22 11:10:47.000000000 +0100 +++ kscreen-5.8.5/kcm/kcm_kscreen.desktop.cmake 2016-12-27 12:24:43.000000000 +0100 @@ -18,7 +18,9 @@ Name[el]=Οθόνες Name[en_GB]=Displays Name[es]=Pantallas +Name[et]=Monitorid Name[fi]=Näytöt +Name[fr]=Affichages Name[it]=Schermi Name[ko]=디스플레이 Name[lt]=Ekranai @@ -26,14 +28,19 @@ Name[nn]=Skjermar Name[pl]=Ekrany Name[pt]=Ecrãs +Name[pt_BR]=Telas Name[ru]=Экраны Name[sk]=Obrazovky Name[sl]=Zasloni +Name[sr]=Екрани +Name[sr@ijekavian]=Екрани +Name[sr@ijekavianlatin]=Ekrani +Name[sr@latin]=Ekrani Name[sv]=Bildskärmar Name[uk]=Дисплеї Name[x-test]=xxDisplaysxx Name[zh_CN]=显示 -Name[zh_TW]=顯市示 +Name[zh_TW]=顯示 Comment=Manage and configure monitors and displays Comment[ar]=أدر واضبط الشّاشات والعروض Comment[ast]=Xestiona y configura los monitores y pantalles diff -Nru kscreen-5.8.4/kded/daemon.cpp kscreen-5.8.5/kded/daemon.cpp --- kscreen-5.8.4/kded/daemon.cpp 2016-11-22 11:10:47.000000000 +0100 +++ kscreen-5.8.5/kded/daemon.cpp 2016-12-27 12:24:43.000000000 +0100 @@ -196,6 +196,16 @@ { qCDebug(KSCREEN_KDED) << "Change detected"; logConfig(m_monitoredConfig); + + // Modes may have changed, fix-up current mode id + Q_FOREACH(const KScreen::OutputPtr &output, m_monitoredConfig->outputs()) { + if (output->isConnected() && output->isEnabled() && output->currentMode().isNull()) { + qCDebug(KSCREEN_KDED) << "Current mode" << output->currentModeId() << "invalid, setting preferred mode" << output->preferredModeId(); + output->setCurrentModeId(output->preferredModeId()); + doApplyConfig(m_monitoredConfig); + } + } + // Reset timer, delay the writeback m_saveTimer->start(); } @@ -206,6 +216,7 @@ // We assume the config is valid, since it's what we got, but we are interested // in the "at least one enabled screen" check + const bool valid = KScreen::Config::canBeApplied(m_monitoredConfig, KScreen::Config::ValidityFlag::RequireAtLeastOneEnabledScreen); if (valid) { Serializer::saveConfig(m_monitoredConfig, Serializer::configId(m_monitoredConfig)); diff -Nru kscreen-5.8.4/po/ar/kscreen.po kscreen-5.8.5/po/ar/kscreen.po --- kscreen-5.8.4/po/ar/kscreen.po 2016-11-22 11:10:51.000000000 +0100 +++ kscreen-5.8.5/po/ar/kscreen.po 2016-12-27 12:24:46.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2015-01-25 00:02+0300\n" "Last-Translator: Safa Alfulaij <safa1996alful...@gmail.com>\n" "Language-Team: Arabic <d...@arabeyes.org>\n" @@ -23,13 +23,13 @@ msgid "Switch Display" msgstr "بدّل العرض" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ast/kscreen.po kscreen-5.8.5/po/ast/kscreen.po --- kscreen-5.8.4/po/ast/kscreen.po 2016-11-22 11:10:51.000000000 +0100 +++ kscreen-5.8.5/po/ast/kscreen.po 2016-12-27 12:24:46.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-03-29 01:21+0100\n" "Last-Translator: enolp <en...@softastur.org>\n" "Language-Team: Asturian <>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Camudar pantalla" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/bs/kcm_displayconfiguration.po kscreen-5.8.5/po/bs/kcm_displayconfiguration.po --- kscreen-5.8.4/po/bs/kcm_displayconfiguration.po 2016-11-22 11:10:55.000000000 +0100 +++ kscreen-5.8.5/po/bs/kcm_displayconfiguration.po 2016-12-27 12:24:49.000000000 +0100 @@ -11,7 +11,7 @@ "PO-Revision-Date: 2015-01-23 14:43+0100\n" "Last-Translator: Samir Ribic <samir.ri...@etf.unsa.ba>\n" "Language-Team: Bosnian\n" -"Language: \n" +"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru kscreen-5.8.4/po/bs/kscreen.po kscreen-5.8.5/po/bs/kscreen.po --- kscreen-5.8.4/po/bs/kscreen.po 2016-11-22 11:10:55.000000000 +0100 +++ kscreen-5.8.5/po/bs/kscreen.po 2016-12-27 12:24:49.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kscreenN\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2013-10-19 10:53+0000\n" "Last-Translator: Samir Ribić <Unknown>\n" "Language-Team: bosanski <b...@li.org>\n" @@ -25,13 +25,13 @@ msgid "Switch Display" msgstr "Prebaci ekran" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ca/kscreen.po kscreen-5.8.5/po/ca/kscreen.po --- kscreen-5.8.4/po/ca/kscreen.po 2016-11-22 11:10:56.000000000 +0100 +++ kscreen-5.8.5/po/ca/kscreen.po 2016-12-27 12:24:49.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-10 22:42+0200\n" "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" @@ -25,13 +25,13 @@ msgid "Switch Display" msgstr "Commuta la pantalla" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "No hi ha cap pantalla externa" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ca@valencia/kscreen.po kscreen-5.8.5/po/ca@valencia/kscreen.po --- kscreen-5.8.4/po/ca@valencia/kscreen.po 2016-11-22 11:10:56.000000000 +0100 +++ kscreen-5.8.5/po/ca@valencia/kscreen.po 2016-12-27 12:24:49.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-10 22:42+0200\n" "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" @@ -25,13 +25,13 @@ msgid "Switch Display" msgstr "Commuta la pantalla" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "No hi ha cap pantalla externa" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/cs/kscreen.po kscreen-5.8.5/po/cs/kscreen.po --- kscreen-5.8.4/po/cs/kscreen.po 2016-11-22 11:10:56.000000000 +0100 +++ kscreen-5.8.5/po/cs/kscreen.po 2016-12-27 12:24:50.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-11-02 12:54+0100\n" "Last-Translator: Vít Pelčák <v...@pelcak.org>\n" "Language-Team: Czech <kde-i18n-...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Přepnout obrazovku" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Žádný externí displej" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/da/kscreen.po kscreen-5.8.5/po/da/kscreen.po --- kscreen-5.8.4/po/da/kscreen.po 2016-11-22 11:11:00.000000000 +0100 +++ kscreen-5.8.5/po/da/kscreen.po 2016-12-27 12:24:51.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-24 22:03+0100\n" "Last-Translator: Martin Schlander <mschlan...@opensuse.org>\n" "Language-Team: Danish <kde-i18n-...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Skift skærm" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Ingen ekstern skærm" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/de/kscreen.po kscreen-5.8.5/po/de/kscreen.po --- kscreen-5.8.4/po/de/kscreen.po 2016-11-22 11:11:01.000000000 +0100 +++ kscreen-5.8.5/po/de/kscreen.po 2016-12-27 12:24:52.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-18 20:40+0100\n" "Last-Translator: Burkhard Lück <lu...@hube-lueck.de>\n" "Language-Team: German <kde-i18n...@kde.org>\n" @@ -19,13 +19,13 @@ msgid "Switch Display" msgstr "Anzeige wechseln" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Keine externe Anzeige" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/el/kscreen.po kscreen-5.8.5/po/el/kscreen.po --- kscreen-5.8.4/po/el/kscreen.po 2016-11-22 11:11:00.000000000 +0100 +++ kscreen-5.8.5/po/el/kscreen.po 2016-12-27 12:24:52.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-16 14:34+0200\n" "Last-Translator: Dimitris Kardarakos <dimk...@gmail.com>\n" "Language-Team: Greek <kde-i18n...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Εναλλαγή οθόνης" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Καμία εξωτερική οθόνη" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/en_GB/kscreen.po kscreen-5.8.5/po/en_GB/kscreen.po --- kscreen-5.8.4/po/en_GB/kscreen.po 2016-11-22 11:10:59.000000000 +0100 +++ kscreen-5.8.5/po/en_GB/kscreen.po 2016-12-27 12:24:52.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-11 11:01+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" "Language-Team: English <kde-l10n-en...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Switch Display" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "No External Display" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/es/kscreen.po kscreen-5.8.5/po/es/kscreen.po --- kscreen-5.8.4/po/es/kscreen.po 2016-11-22 11:11:02.000000000 +0100 +++ kscreen-5.8.5/po/es/kscreen.po 2016-12-27 12:24:56.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-11 12:37+0200\n" "Last-Translator: Eloy Cuadra <ecua...@eloihr.net>\n" "Language-Team: Spanish <kde-l10n...@kde.org>\n" @@ -24,13 +24,13 @@ msgid "Switch Display" msgstr "Cambiar pantalla" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Ninguna pantalla externa" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/et/kscreen.po kscreen-5.8.5/po/et/kscreen.po --- kscreen-5.8.4/po/et/kscreen.po 2016-11-22 11:11:03.000000000 +0100 +++ kscreen-5.8.5/po/et/kscreen.po 2016-12-27 12:24:56.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-11 06:13+0300\n" "Last-Translator: Marek Laane <qiila...@gmail.com>\n" "Language-Team: Estonian <kde-i18n-...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Vaheta monitori" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Väline kuva puudub" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/fi/kscreen.po kscreen-5.8.5/po/fi/kscreen.po --- kscreen-5.8.4/po/fi/kscreen.po 2016-11-22 11:11:08.000000000 +0100 +++ kscreen-5.8.5/po/fi/kscreen.po 2016-12-27 12:24:56.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-24 18:49+0300\n" "Last-Translator: Tommi Nieminen <transla...@legisign.org>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" @@ -23,13 +23,13 @@ msgid "Switch Display" msgstr "Vaihda näyttöä" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Ei ulkoista näyttöä" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/fr/kcm_displayconfiguration.po kscreen-5.8.5/po/fr/kcm_displayconfiguration.po --- kscreen-5.8.4/po/fr/kcm_displayconfiguration.po 2016-11-22 11:11:09.000000000 +0100 +++ kscreen-5.8.5/po/fr/kcm_displayconfiguration.po 2016-12-27 12:24:57.000000000 +0100 @@ -4,15 +4,16 @@ # xavier <xavier.besn...@neuf.fr>, 2013. # Vincent PINON <vincent.pi...@laposte.net>, 2014. # Maxime Corteel <mcort...@gmail.com>, 2014, 2015. +# Vincent Pinon <vpi...@kde.org>, 2016. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 22:52+0100\n" -"PO-Revision-Date: 2015-11-11 09:28+0100\n" -"Last-Translator: Maxime Corteel <mcort...@gmail.com>\n" -"Language-Team: French <kde-francoph...@kde.org>\n" +"PO-Revision-Date: 2016-11-23 13:52+0100\n" +"Last-Translator: Vincent Pinon <vpi...@kde.org>\n" +"Language-Team: French <kde-i18n-...@kde.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,12 +27,12 @@ #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Joëlle Cornavin, Maxime Corteel" +msgstr "Joëlle Cornavin, Maxime Corteel, Vincent Pinon" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "jc...@free.fr, mcort...@gmail.com" +msgstr "jc...@free.fr, mcort...@gmail.com, vpi...@kde.org" #: qml/main.qml:82 msgid "Tip: Hold Ctrl while dragging a display to disable snapping" @@ -215,25 +216,25 @@ #: src/scaling.ui:14 #, kde-format msgid "Dialog" -msgstr "" +msgstr "Boîte de dialogue" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: src/scaling.ui:20 #, kde-format msgid "Screen Scaling" -msgstr "" +msgstr "Échelle de l'écran" #. i18n: ectx: property (text), widget (QLabel, label) #: src/scaling.ui:31 #, kde-format msgid "Scale:" -msgstr "" +msgstr "Échelle :" #. i18n: ectx: property (text), widget (QLabel, scaleLabel) #: src/scaling.ui:72 #, kde-format msgid "TextLabel" -msgstr "" +msgstr "Étiquette de texte" #: src/scalingconfig.cpp:40 #, kde-format @@ -246,44 +247,44 @@ #: src/stylepreview.ui:19 #, kde-format msgid "Tab 1" -msgstr "" +msgstr "Onglet 1" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1) #: src/stylepreview.ui:29 #, kde-format msgid "Group Box" -msgstr "" +msgstr "Boîte de groupe" #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1) #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2) #: src/stylepreview.ui:35 src/stylepreview.ui:45 #, kde-format msgid "Radio button" -msgstr "" +msgstr "Bouton radio" #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1) #: src/stylepreview.ui:62 #, kde-format msgid "Checkbox" -msgstr "" +msgstr "Case à cocher" #. i18n: ectx: property (text), widget (QPushButton, PushButton1) #: src/stylepreview.ui:115 #, kde-format msgid "Button" -msgstr "" +msgstr "Bouton" #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1) #: src/stylepreview.ui:125 #, kde-format msgid "Combobox" -msgstr "" +msgstr "Liste déroulante" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:155 #, kde-format msgid "Tab 2" -msgstr "" +msgstr "Onglet 2" #: src/widget.cpp:90 #, kde-format diff -Nru kscreen-5.8.4/po/fr/kscreen.po kscreen-5.8.5/po/fr/kscreen.po --- kscreen-5.8.4/po/fr/kscreen.po 2016-11-22 11:11:09.000000000 +0100 +++ kscreen-5.8.5/po/fr/kscreen.po 2016-12-27 12:24:57.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-11-21 16:12+0100\n" "Last-Translator: Vincent Pinon <vpi...@kde.org>\n" "Language-Team: French <kde-i18n-...@kde.org>\n" @@ -26,13 +26,13 @@ msgid "Switch Display" msgstr "Changer d'affichage" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Aucun affichage externe" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/gl/kscreen.po kscreen-5.8.5/po/gl/kscreen.po --- kscreen-5.8.4/po/gl/kscreen.po 2016-11-22 11:11:10.000000000 +0100 +++ kscreen-5.8.5/po/gl/kscreen.po 2016-12-27 12:24:58.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2015-03-15 10:48+0100\n" "Last-Translator: Adrián Chaves Fernández <adriyeticha...@gmail.com>\n" "Language-Team: Galician <kde-i18n-...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Cambiar de pantalla" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/he/kscreen.po kscreen-5.8.5/po/he/kscreen.po --- kscreen-5.8.4/po/he/kscreen.po 2016-11-22 11:11:12.000000000 +0100 +++ kscreen-5.8.5/po/he/kscreen.po 2016-12-27 12:24:59.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-18 22:24+0200\n" "Last-Translator: Elkana Bardugo <ttv...@gmail.com>\n" "Language-Team: Hebrew <kde-i18n-...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "החלף תצוגות" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "אין תצוגה חיצונית" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/it/kscreen.po kscreen-5.8.5/po/it/kscreen.po --- kscreen-5.8.4/po/it/kscreen.po 2016-11-22 11:11:16.000000000 +0100 +++ kscreen-5.8.5/po/it/kscreen.po 2016-12-27 12:25:03.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-13 22:20+0200\n" "Last-Translator: Vincenzo Reale <smart2...@baslug.org>\n" "Language-Team: Italian <kde-i18n...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Cambia schermo" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Nessuno schermo esterno" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ja/kscreen.po kscreen-5.8.5/po/ja/kscreen.po --- kscreen-5.8.4/po/ja/kscreen.po 2016-11-22 11:11:17.000000000 +0100 +++ kscreen-5.8.5/po/ja/kscreen.po 2016-12-27 12:25:05.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2013-01-06 14:35-0800\n" "Last-Translator: Japanese KDE translation team <kde...@kde.org>\n" "Language-Team: Japanese <kde...@kde.org>\n" @@ -19,13 +19,13 @@ msgid "Switch Display" msgstr "" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ko/kscreen.po kscreen-5.8.5/po/ko/kscreen.po --- kscreen-5.8.4/po/ko/kscreen.po 2016-11-22 11:11:19.000000000 +0100 +++ kscreen-5.8.5/po/ko/kscreen.po 2016-12-27 12:25:05.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-10-20 21:50+0100\n" "Last-Translator: Shinjo Park <k...@peremen.name>\n" "Language-Team: Korean <k...@peremen.name>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "화면 전환" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "외부 디스플레이 없음" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/lt/kscreen.po kscreen-5.8.5/po/lt/kscreen.po --- kscreen-5.8.4/po/lt/kscreen.po 2016-11-22 11:11:21.000000000 +0100 +++ kscreen-5.8.5/po/lt/kscreen.po 2016-12-27 12:25:07.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: trunk-kf 5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-12 09:03+0300\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.ka...@gmail.com>\n" "Language-Team: Lithuanian <kde-i18n...@kde.org>\n" @@ -26,13 +26,13 @@ msgid "Switch Display" msgstr "Perjungti ekraną" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Išorinio monitoriaus nėra" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/nb/kcm_displayconfiguration.po kscreen-5.8.5/po/nb/kcm_displayconfiguration.po --- kscreen-5.8.4/po/nb/kcm_displayconfiguration.po 2016-11-22 11:11:27.000000000 +0100 +++ kscreen-5.8.5/po/nb/kcm_displayconfiguration.po 2016-12-27 12:25:10.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-10-17 10:52+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2015-08-27 16:59+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -19,10 +19,12 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +#, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Bjørn Steensrud" +#, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "bjor...@skogkatt.homelinux.org" @@ -46,56 +48,69 @@ msgstr "Identifiser utganger" #: qml/Output.qml:231 src/unifiedoutputconfig.cpp:84 +#, kde-format msgid "Unified Outputs" msgstr "Forente utganger" #: qml/Output.qml:233 src/utils.cpp:37 +#, kde-format msgid "Laptop Screen" msgstr "Skjerm på bærbar" #: src/kcm_kscreen.cpp:60 +#, kde-format msgid "Display Configuration" msgstr "Skjermoppsett" #: src/kcm_kscreen.cpp:61 +#, kde-format msgid "Configuration for displays" msgstr "Oppsett for skjermer" #: src/kcm_kscreen.cpp:62 +#, kde-format msgid "(c), 2012-2013 Daniel Vrátil" msgstr "© 2012–2013 Dan Vrátil" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Daniel Vrátil" msgstr "Daniel Vrátil" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Maintainer" msgstr "Vedlikeholder" #: src/kcm_kscreen.cpp:79 +#, kde-format msgid "No kscreen backend found. Please check your kscreen installation." msgstr "" "Fant ingen bakgrunnsmotor for kscreen. Kontroller kscreen-installasjonen." #: src/kcm_kscreen.cpp:132 +#, kde-format msgid "Are you sure you want to disable all outputs?" msgstr "Er du sikker på at du vil slå av alle utganger?" #: src/kcm_kscreen.cpp:133 +#, kde-format msgctxt "@title:window" msgid "Disable All Outputs" msgstr "Slå av alle utganger" #: src/kcm_kscreen.cpp:134 +#, kde-format msgid "&Disable All Outputs" msgstr "&Slå av alle utganger" #: src/kcm_kscreen.cpp:135 +#, kde-format msgid "&Reconfigure" msgstr "&Sett opp på nytt" #: src/kcm_kscreen.cpp:144 +#, kde-format msgid "" "Sorry, your configuration could not be applied.\n" "\n" @@ -108,55 +123,68 @@ "skjermer enn det GPU-en støtter." #: src/kcm_kscreen.cpp:146 +#, kde-format msgctxt "@title:window" msgid "Unsupported Configuration" msgstr "Ikke støttet oppsett" #: src/kcm_testapp.cpp:34 +#, kde-format msgid "KCM Test App" msgstr "KCM Testprogram" #: src/outputconfig.cpp:101 +#, kde-format msgid "Enabled" msgstr "Slått på" #: src/outputconfig.cpp:109 +#, kde-format msgid "Display:" msgstr "Skjerm:" #: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:94 +#, kde-format msgid "Resolution:" msgstr "Oppløsning:" #: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:101 +#, kde-format msgid "Normal" msgstr "Normal" #: src/outputconfig.cpp:118 src/unifiedoutputconfig.cpp:102 +#, kde-format msgid "90° Clockwise" msgstr "90° medurs" #: src/outputconfig.cpp:119 src/unifiedoutputconfig.cpp:103 +#, kde-format msgid "Upside Down" msgstr "Opp ned" #: src/outputconfig.cpp:120 src/unifiedoutputconfig.cpp:104 +#, kde-format msgid "90° Counterclockwise" msgstr "90° moturs" #: src/outputconfig.cpp:125 src/unifiedoutputconfig.cpp:105 +#, kde-format msgid "Orientation:" msgstr "Orientering:" #: src/outputconfig.cpp:129 +#, kde-format msgid "Advanced Settings" msgstr "Avanserte innstillinger" #: src/outputconfig.cpp:144 +#, kde-format msgid "Auto" msgstr "Auto" #: src/outputconfig.cpp:145 +#, kde-format msgid "Refresh rate:" msgstr "Oppfriskingsrate:" @@ -166,89 +194,108 @@ msgstr "%1 Hz" #: src/primaryoutputcombo.cpp:38 src/primaryoutputcombo.cpp:55 +#, kde-format msgid "No Primary Output" msgstr "Ingen hovedutgang" #: src/resolutionslider.cpp:83 +#, kde-format msgid "No available resolutions" msgstr "Ingen tilgjengelige skjermoppløsninger" #. i18n: ectx: property (windowTitle), widget (QDialog, Scaling) #: src/scaling.ui:14 +#, kde-format msgid "Dialog" msgstr "" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: src/scaling.ui:20 +#, kde-format msgid "Screen Scaling" msgstr "" #. i18n: ectx: property (text), widget (QLabel, label) #: src/scaling.ui:31 +#, kde-format msgid "Scale:" msgstr "" #. i18n: ectx: property (text), widget (QLabel, scaleLabel) #: src/scaling.ui:72 +#, kde-format msgid "TextLabel" msgstr "Tekstetikett" #: src/scalingconfig.cpp:40 +#, kde-format msgid "Scaling changes will come into effect after restart" msgstr "Endringer i skalering får virkning etter omstart" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:19 +#, kde-format msgid "Tab 1" msgstr "Fane 1" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1) #: src/stylepreview.ui:29 +#, kde-format msgid "Group Box" msgstr "Gruppeboks" #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1) #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2) #: src/stylepreview.ui:35 src/stylepreview.ui:45 +#, kde-format msgid "Radio button" msgstr "Radioknapp" #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1) #: src/stylepreview.ui:62 +#, kde-format msgid "Checkbox" msgstr "" #. i18n: ectx: property (text), widget (QPushButton, PushButton1) #: src/stylepreview.ui:115 +#, kde-format msgid "Button" msgstr "Knapp" #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1) #: src/stylepreview.ui:125 +#, kde-format msgid "Combobox" msgstr "Komboboks" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:155 +#, kde-format msgid "Tab 2" msgstr "Fane 2" #: src/widget.cpp:90 +#, kde-format msgid "Primary display:" msgstr "Hovedskjerm:" #: src/widget.cpp:103 +#, kde-format msgid "Active profile" msgstr "Aktiv profil" #: src/widget.cpp:112 src/widget.cpp:272 +#, kde-format msgid "Unify Outputs" msgstr "Foren utganger" #: src/widget.cpp:120 +#, kde-format msgid "Scale Display" msgstr "Skaler visning" #: src/widget.cpp:312 +#, kde-format msgid "Break Unified Outputs" msgstr "Bryt opp forente utganger" \ No newline at end of file diff -Nru kscreen-5.8.4/po/nb/kscreen.po kscreen-5.8.5/po/nb/kscreen.po --- kscreen-5.8.4/po/nb/kscreen.po 2016-11-22 11:11:27.000000000 +0100 +++ kscreen-5.8.5/po/nb/kscreen.po 2016-12-27 12:25:10.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-10 07:52+0000\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2013-11-28 12:03+0100\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -20,15 +20,18 @@ "X-Text-Markup: kde4\n" #: daemon.cpp:90 +#, kde-format msgid "Switch Display" msgstr "Bytt skjerm" -#: daemon.cpp:235 +#: daemon.cpp:246 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" msgstr "" \ No newline at end of file diff -Nru kscreen-5.8.4/po/nb/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.8.5/po/nb/plasma_applet_org.kde.plasma.kscreen.po --- kscreen-5.8.4/po/nb/plasma_applet_org.kde.plasma.kscreen.po 2016-11-22 11:11:27.000000000 +0100 +++ kscreen-5.8.5/po/nb/plasma_applet_org.kde.plasma.kscreen.po 2016-12-27 12:25:10.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-09 08:30+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2013-11-28 12:43+0100\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -20,10 +20,12 @@ "X-Text-Markup: kde4\n" #: kscreenapplet.cpp:82 +#, kde-format msgid "Failed to connect to KScreen daemon" msgstr "Klarte ikke koble til KScreen-daemonen" #: kscreenapplet.cpp:96 +#, kde-format msgid "Failed to load root object" msgstr "Klarte ikke laste rot-objektet" @@ -34,30 +36,36 @@ msgstr "En ny skjerm %1 er funnet" #: package/contents/ui/main.qml:91 +#, kde-format msgctxt "Places the newly connected screen right of the existing one" msgid "Extend to Right" msgstr "Utvid mot høyre" #: package/contents/ui/main.qml:101 +#, kde-format msgctxt "Places the newly connected screen left of the existing one" msgid "Extend to Left" msgstr "Utvid mot venstre" #: package/contents/ui/main.qml:111 +#, kde-format msgctxt "Makes the newly conencted screen a clone of the primary one" msgid "Clone Primary Output" msgstr "Klon hovedutgangen" #: package/contents/ui/main.qml:121 +#, kde-format msgctxt "Disables the newly connected screen" msgid "Disable" msgstr "Slå av" #: package/contents/ui/main.qml:131 +#, kde-format msgid "No Action" msgstr "Ingen handling" #: package/contents/ui/main.qml:141 +#, kde-format msgctxt "Opens KScreen KCM" msgid "Advanced Configuration" msgstr "Avansert oppsett" \ No newline at end of file diff -Nru kscreen-5.8.4/po/nl/kscreen.po kscreen-5.8.5/po/nl/kscreen.po --- kscreen-5.8.4/po/nl/kscreen.po 2016-11-22 11:11:33.000000000 +0100 +++ kscreen-5.8.5/po/nl/kscreen.po 2016-12-27 12:25:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-14 00:27+0200\n" "Last-Translator: Freek de Kruijf <fr...@opensuse.org>\n" "Language-Team: Dutch <kde-i18n...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Scherm wisselen" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Geen extern scherm" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/nn/kscreen.po kscreen-5.8.5/po/nn/kscreen.po --- kscreen-5.8.4/po/nn/kscreen.po 2016-11-22 11:11:33.000000000 +0100 +++ kscreen-5.8.5/po/nn/kscreen.po 2016-12-27 12:25:11.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-10-13 21:06+0100\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" @@ -24,13 +24,13 @@ msgid "Switch Display" msgstr "Byt skjerm" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Ingen ekstern skjem" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/pa/kscreen.po kscreen-5.8.5/po/pa/kscreen.po --- kscreen-5.8.4/po/pa/kscreen.po 2016-11-22 11:11:37.000000000 +0100 +++ kscreen-5.8.5/po/pa/kscreen.po 2016-12-27 12:25:13.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2015-02-01 03:22-0600\n" "Last-Translator: A S Alam <aa...@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-us...@list.sf.net>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "ਡਿਸਪਲੇਅ ਬਦਲੋ" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/pl/kscreen.po kscreen-5.8.5/po/pl/kscreen.po --- kscreen-5.8.4/po/pl/kscreen.po 2016-11-22 11:11:37.000000000 +0100 +++ kscreen-5.8.5/po/pl/kscreen.po 2016-12-27 12:25:14.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-17 09:39+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" @@ -23,13 +23,13 @@ msgid "Switch Display" msgstr "Przełącz ekran" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Brak zewnętrznego ekranu" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/pt/kcm_displayconfiguration.po kscreen-5.8.5/po/pt/kcm_displayconfiguration.po --- kscreen-5.8.4/po/pt/kcm_displayconfiguration.po 2016-11-22 11:11:37.000000000 +0100 +++ kscreen-5.8.5/po/pt/kcm_displayconfiguration.po 2016-12-27 12:25:14.000000000 +0100 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2016-04-11 12:15+0100\n" "Last-Translator: José Nuno Coelho Pires <zepi...@gmail.com>\n" "Language-Team: Portuguese <kde-i18n...@kde.org>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru kscreen-5.8.4/po/pt/kscreen.po kscreen-5.8.5/po/pt/kscreen.po --- kscreen-5.8.4/po/pt/kscreen.po 2016-11-22 11:11:37.000000000 +0100 +++ kscreen-5.8.5/po/pt/kscreen.po 2016-12-27 12:25:14.000000000 +0100 @@ -7,11 +7,11 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-11 16:29+0100\n" "Last-Translator: José Nuno Coelho Pires <zepi...@gmail.com>\n" "Language-Team: Portuguese <kde-i18n...@kde.org>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Mudar de Ecrã" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Sem Ecrã Externo" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/pt/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.8.5/po/pt/plasma_applet_org.kde.plasma.kscreen.po --- kscreen-5.8.4/po/pt/plasma_applet_org.kde.plasma.kscreen.po 2016-11-22 11:11:37.000000000 +0100 +++ kscreen-5.8.5/po/pt/plasma_applet_org.kde.plasma.kscreen.po 2016-12-27 12:25:14.000000000 +0100 @@ -6,7 +6,7 @@ "PO-Revision-Date: 2013-07-10 09:51+0100\n" "Last-Translator: José Nuno Coelho Pires <zepi...@gmail.com>\n" "Language-Team: Portuguese <kde-i18n...@kde.org>\n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff -Nru kscreen-5.8.4/po/pt_BR/kscreen.po kscreen-5.8.5/po/pt_BR/kscreen.po --- kscreen-5.8.4/po/pt_BR/kscreen.po 2016-11-22 11:11:37.000000000 +0100 +++ kscreen-5.8.5/po/pt_BR/kscreen.po 2016-12-27 12:25:14.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-12 09:21-0300\n" "Last-Translator: Luiz Fernando Ranghetti <elchev...@opensuse.org>\n" "Language-Team: Portuguese <kde-i18n-pt...@kde.org>\n" @@ -24,13 +24,13 @@ msgid "Switch Display" msgstr "Alternar tela" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Sem tela externa" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ro/kscreen.po kscreen-5.8.5/po/ro/kscreen.po --- kscreen-5.8.4/po/ro/kscreen.po 2016-11-22 11:11:38.000000000 +0100 +++ kscreen-5.8.5/po/ro/kscreen.po 2016-12-27 12:25:14.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2015-04-20 14:29+0300\n" "Last-Translator: Sergiu Bivol <ser...@cip.md>\n" "Language-Team: Romanian <kde-i18n...@kde.org>\n" @@ -23,13 +23,13 @@ msgid "Switch Display" msgstr "Comută afișajul" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/ru/kscreen.po kscreen-5.8.5/po/ru/kscreen.po --- kscreen-5.8.4/po/ru/kscreen.po 2016-11-22 11:11:55.000000000 +0100 +++ kscreen-5.8.5/po/ru/kscreen.po 2016-12-27 12:25:16.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-29 05:01+0300\n" "Last-Translator: Alexander Potashev <aspotas...@gmail.com>\n" "Language-Team: Russian <kde-russ...@lists.kde.ru>\n" @@ -27,13 +27,13 @@ msgid "Switch Display" msgstr "Сменить экран" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Нет внешних экранов" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/sk/kscreen.po kscreen-5.8.5/po/sk/kscreen.po --- kscreen-5.8.4/po/sk/kscreen.po 2016-11-22 11:11:54.000000000 +0100 +++ kscreen-5.8.5/po/sk/kscreen.po 2016-12-27 12:25:16.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-11 13:14+0100\n" "Last-Translator: Roman Paholik <wizzar...@gmail.com>\n" "Language-Team: Slovak <kde...@linux.sk>\n" @@ -20,13 +20,13 @@ msgid "Switch Display" msgstr "Prepnúť obrazovku" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Žiadny externý displej" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/sl/kscreen.po kscreen-5.8.5/po/sl/kscreen.po --- kscreen-5.8.4/po/sl/kscreen.po 2016-11-22 11:12:02.000000000 +0100 +++ kscreen-5.8.5/po/sl/kscreen.po 2016-12-27 12:25:17.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-16 17:31+0200\n" "Last-Translator: Andrej Mernik <andr...@ubuntu.si>\n" "Language-Team: Slovenian <lugos-...@lugos.si>\n" @@ -23,13 +23,13 @@ msgid "Switch Display" msgstr "Preklopi zaslon" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Ni zunanjih zaslonov" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/sr/kcm_displayconfiguration.po kscreen-5.8.5/po/sr/kcm_displayconfiguration.po --- kscreen-5.8.4/po/sr/kcm_displayconfiguration.po 2016-11-22 11:12:15.000000000 +0100 +++ kscreen-5.8.5/po/sr/kcm_displayconfiguration.po 2016-12-27 12:25:18.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kcm_displayconfiguration\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-14 07:13+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,10 +18,12 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" +#, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Часлав Илић" +#, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "caslav.i...@gmx.net" @@ -47,57 +49,70 @@ msgstr "Идентификуј излазе" #: qml/Output.qml:231 src/unifiedoutputconfig.cpp:84 +#, kde-format msgid "Unified Outputs" msgstr "Сједињени излази" # >> @item #: qml/Output.qml:233 src/utils.cpp:37 +#, kde-format msgid "Laptop Screen" msgstr "екран лаптопа" #: src/kcm_kscreen.cpp:60 +#, kde-format msgid "Display Configuration" msgstr "Постава екрана" #: src/kcm_kscreen.cpp:61 +#, kde-format msgid "Configuration for displays" msgstr "Подешавање за екране" #: src/kcm_kscreen.cpp:62 +#, kde-format msgid "(c), 2012-2013 Daniel Vrátil" msgstr "© 2012–2013, Данијел Вратил" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Daniel Vrátil" msgstr "Данијел Вратил" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Maintainer" msgstr "Одржавалац" #: src/kcm_kscreen.cpp:79 +#, kde-format msgid "No kscreen backend found. Please check your kscreen installation." msgstr "Није нађена ниједна позадина К‑екрана. Проверите инсталацију." #: src/kcm_kscreen.cpp:132 +#, kde-format msgid "Are you sure you want to disable all outputs?" msgstr "Желите ли заиста да искључите све излазе?" #: src/kcm_kscreen.cpp:133 +#, kde-format msgctxt "@title:window" msgid "Disable All Outputs" msgstr "Искључивање свих излаза" #: src/kcm_kscreen.cpp:134 +#, kde-format msgid "&Disable All Outputs" msgstr "&Искључи све излазе" #: src/kcm_kscreen.cpp:135 +#, kde-format msgid "&Reconfigure" msgstr "&Подеси поново" # rewrite-msgid: /GPU/graphics card/ #: src/kcm_kscreen.cpp:144 +#, kde-format msgid "" "Sorry, your configuration could not be applied.\n" "\n" @@ -110,61 +125,74 @@ "него што графичка картица подржава." #: src/kcm_kscreen.cpp:146 +#, kde-format msgctxt "@title:window" msgid "Unsupported Configuration" msgstr "Неподржана постава" #: src/kcm_testapp.cpp:34 +#, kde-format msgid "KCM Test App" msgstr "КЦМ пробни програм" # >> @item #: src/outputconfig.cpp:101 +#, kde-format msgid "Enabled" msgstr "укључен" #: src/outputconfig.cpp:109 +#, kde-format msgid "Display:" msgstr "Екран:" #: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:94 +#, kde-format msgid "Resolution:" msgstr "Резолуција:" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:101 +#, kde-format msgid "Normal" msgstr "нормално" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:118 src/unifiedoutputconfig.cpp:102 +#, kde-format msgid "90° Clockwise" msgstr "90° казаљке сата" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:119 src/unifiedoutputconfig.cpp:103 +#, kde-format msgid "Upside Down" msgstr "изврнуто" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:120 src/unifiedoutputconfig.cpp:104 +#, kde-format msgid "90° Counterclockwise" msgstr "90° супротно казаљке сата" #: src/outputconfig.cpp:125 src/unifiedoutputconfig.cpp:105 +#, kde-format msgid "Orientation:" msgstr "Оријентација:" #: src/outputconfig.cpp:129 +#, kde-format msgid "Advanced Settings" msgstr "Напредне поставке" # >> @item:inlistbox Refresh rate: #: src/outputconfig.cpp:144 +#, kde-format msgid "Auto" msgstr "аутоматски" #: src/outputconfig.cpp:145 +#, kde-format msgid "Refresh rate:" msgstr "Освежавање:" @@ -175,89 +203,108 @@ # >> @item:inlistbox #: src/primaryoutputcombo.cpp:38 src/primaryoutputcombo.cpp:55 +#, kde-format msgid "No Primary Output" msgstr "без примарног излаза" #: src/resolutionslider.cpp:83 +#, kde-format msgid "No available resolutions" msgstr "Нема доступних резолуција." #. i18n: ectx: property (windowTitle), widget (QDialog, Scaling) #: src/scaling.ui:14 +#, kde-format msgid "Dialog" msgstr "Дијалог" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: src/scaling.ui:20 +#, kde-format msgid "Screen Scaling" msgstr "Скалирање екрана" #. i18n: ectx: property (text), widget (QLabel, label) #: src/scaling.ui:31 +#, kde-format msgid "Scale:" msgstr "Размера:" #. i18n: ectx: property (text), widget (QLabel, scaleLabel) #: src/scaling.ui:72 +#, kde-format msgid "TextLabel" msgstr "TextLabel" #: src/scalingconfig.cpp:40 +#, kde-format msgid "Scaling changes will come into effect after restart" msgstr "Промене у величини ступиће на снагу по поновном покретању." #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:19 +#, kde-format msgid "Tab 1" msgstr "Језичак 1" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1) #: src/stylepreview.ui:29 +#, kde-format msgid "Group Box" msgstr "Оквир групе" #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1) #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2) #: src/stylepreview.ui:35 src/stylepreview.ui:45 +#, kde-format msgid "Radio button" msgstr "Радио дугме" #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1) #: src/stylepreview.ui:62 +#, kde-format msgid "Checkbox" msgstr "Кућица" #. i18n: ectx: property (text), widget (QPushButton, PushButton1) #: src/stylepreview.ui:115 +#, kde-format msgid "Button" msgstr "Дугме" #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1) #: src/stylepreview.ui:125 +#, kde-format msgid "Combobox" msgstr "Списак" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:155 +#, kde-format msgid "Tab 2" msgstr "Језичак 2" #: src/widget.cpp:90 +#, kde-format msgid "Primary display:" msgstr "Примарни екран:" #: src/widget.cpp:103 +#, kde-format msgid "Active profile" msgstr "Активни профил" -#: src/widget.cpp:112 src/widget.cpp:271 +#: src/widget.cpp:112 src/widget.cpp:272 +#, kde-format msgid "Unify Outputs" msgstr "Сједини излазе" #: src/widget.cpp:120 +#, kde-format msgid "Scale Display" msgstr "Скалирај екран" -#: src/widget.cpp:311 +#: src/widget.cpp:312 +#, kde-format msgid "Break Unified Outputs" msgstr "Растави сједињене излазе" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr/kscreen.po kscreen-5.8.5/po/sr/kscreen.po --- kscreen-5.8.4/po/sr/kscreen.po 2016-11-22 11:12:15.000000000 +0100 +++ kscreen-5.8.5/po/sr/kscreen.po 2016-12-27 12:25:18.000000000 +0100 @@ -1,11 +1,11 @@ # Translation of kscreen.po into Serbian. -# Chusslove Illich <caslav.i...@gmx.net>, 2015. +# Chusslove Illich <caslav.i...@gmx.net>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-10 07:52+0000\n" -"PO-Revision-Date: 2015-01-17 13:25+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" +"PO-Revision-Date: 2016-11-23 19:27+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" "Language: sr\n" @@ -19,15 +19,18 @@ "X-Environment: kde\n" #: daemon.cpp:90 +#, kde-format msgid "Switch Display" msgstr "Промени екран" -#: daemon.cpp:235 +#: daemon.cpp:246 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" -msgstr "" +msgstr "Нема спољашњег екрана" -#: daemon.cpp:237 +#: daemon.cpp:248 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" -msgstr "" \ No newline at end of file +msgstr "Промена распореда екрана" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.8.5/po/sr/plasma_applet_org.kde.plasma.kscreen.po --- kscreen-5.8.4/po/sr/plasma_applet_org.kde.plasma.kscreen.po 2016-11-22 11:12:15.000000000 +0100 +++ kscreen-5.8.5/po/sr/plasma_applet_org.kde.plasma.kscreen.po 2016-12-27 12:25:18.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasma_applet_org.kde.plasma.kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-09 08:30+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -19,10 +19,12 @@ "X-Environment: kde\n" #: kscreenapplet.cpp:82 +#, kde-format msgid "Failed to connect to KScreen daemon" msgstr "Не могу да се повежем са К‑екрановим демоном." #: kscreenapplet.cpp:96 +#, kde-format msgid "Failed to load root object" msgstr "Не могу да учитам корени објекат." @@ -33,30 +35,36 @@ msgstr "Откривен је нов екран %1." #: package/contents/ui/main.qml:91 +#, kde-format msgctxt "Places the newly connected screen right of the existing one" msgid "Extend to Right" msgstr "Прошири удесно" #: package/contents/ui/main.qml:101 +#, kde-format msgctxt "Places the newly connected screen left of the existing one" msgid "Extend to Left" msgstr "Прошири улево" #: package/contents/ui/main.qml:111 +#, kde-format msgctxt "Makes the newly conencted screen a clone of the primary one" msgid "Clone Primary Output" msgstr "Клонирај примарни излаз" #: package/contents/ui/main.qml:121 +#, kde-format msgctxt "Disables the newly connected screen" msgid "Disable" msgstr "Деактивирај" #: package/contents/ui/main.qml:131 +#, kde-format msgid "No Action" msgstr "Без радње" #: package/contents/ui/main.qml:141 +#, kde-format msgctxt "Opens KScreen KCM" msgid "Advanced Configuration" msgstr "Напредно подешавање" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@ijekavian/kcm_displayconfiguration.po kscreen-5.8.5/po/sr@ijekavian/kcm_displayconfiguration.po --- kscreen-5.8.4/po/sr@ijekavian/kcm_displayconfiguration.po 2016-11-22 11:12:20.000000000 +0100 +++ kscreen-5.8.5/po/sr@ijekavian/kcm_displayconfiguration.po 2016-12-27 12:25:20.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kcm_displayconfiguration\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-14 07:13+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,10 +18,12 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" +#, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Часлав Илић" +#, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "caslav.i...@gmx.net" @@ -47,57 +49,70 @@ msgstr "Идентификуј излазе" #: qml/Output.qml:231 src/unifiedoutputconfig.cpp:84 +#, kde-format msgid "Unified Outputs" msgstr "Сједињени излази" # >> @item #: qml/Output.qml:233 src/utils.cpp:37 +#, kde-format msgid "Laptop Screen" msgstr "екран лаптопа" #: src/kcm_kscreen.cpp:60 +#, kde-format msgid "Display Configuration" msgstr "Постава екрана" #: src/kcm_kscreen.cpp:61 +#, kde-format msgid "Configuration for displays" msgstr "Подешавање за екране" #: src/kcm_kscreen.cpp:62 +#, kde-format msgid "(c), 2012-2013 Daniel Vrátil" msgstr "© 2012–2013, Данијел Вратил" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Daniel Vrátil" msgstr "Данијел Вратил" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Maintainer" msgstr "Одржавалац" #: src/kcm_kscreen.cpp:79 +#, kde-format msgid "No kscreen backend found. Please check your kscreen installation." msgstr "Није нађена ниједна позадина К‑екрана. Проверите инсталацију." #: src/kcm_kscreen.cpp:132 +#, kde-format msgid "Are you sure you want to disable all outputs?" msgstr "Желите ли заиста да искључите све излазе?" #: src/kcm_kscreen.cpp:133 +#, kde-format msgctxt "@title:window" msgid "Disable All Outputs" msgstr "Искључивање свих излаза" #: src/kcm_kscreen.cpp:134 +#, kde-format msgid "&Disable All Outputs" msgstr "&Искључи све излазе" #: src/kcm_kscreen.cpp:135 +#, kde-format msgid "&Reconfigure" msgstr "&Подеси поново" # rewrite-msgid: /GPU/graphics card/ #: src/kcm_kscreen.cpp:144 +#, kde-format msgid "" "Sorry, your configuration could not be applied.\n" "\n" @@ -110,61 +125,74 @@ "него што графичка картица подржава." #: src/kcm_kscreen.cpp:146 +#, kde-format msgctxt "@title:window" msgid "Unsupported Configuration" msgstr "Неподржана постава" #: src/kcm_testapp.cpp:34 +#, kde-format msgid "KCM Test App" msgstr "КЦМ пробни програм" # >> @item #: src/outputconfig.cpp:101 +#, kde-format msgid "Enabled" msgstr "укључен" #: src/outputconfig.cpp:109 +#, kde-format msgid "Display:" msgstr "Екран:" #: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:94 +#, kde-format msgid "Resolution:" msgstr "Резолуција:" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:101 +#, kde-format msgid "Normal" msgstr "нормално" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:118 src/unifiedoutputconfig.cpp:102 +#, kde-format msgid "90° Clockwise" msgstr "90° казаљке сата" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:119 src/unifiedoutputconfig.cpp:103 +#, kde-format msgid "Upside Down" msgstr "изврнуто" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:120 src/unifiedoutputconfig.cpp:104 +#, kde-format msgid "90° Counterclockwise" msgstr "90° супротно казаљке сата" #: src/outputconfig.cpp:125 src/unifiedoutputconfig.cpp:105 +#, kde-format msgid "Orientation:" msgstr "Оријентација:" #: src/outputconfig.cpp:129 +#, kde-format msgid "Advanced Settings" msgstr "Напредне поставке" # >> @item:inlistbox Refresh rate: #: src/outputconfig.cpp:144 +#, kde-format msgid "Auto" msgstr "аутоматски" #: src/outputconfig.cpp:145 +#, kde-format msgid "Refresh rate:" msgstr "Освежавање:" @@ -175,89 +203,108 @@ # >> @item:inlistbox #: src/primaryoutputcombo.cpp:38 src/primaryoutputcombo.cpp:55 +#, kde-format msgid "No Primary Output" msgstr "без примарног излаза" #: src/resolutionslider.cpp:83 +#, kde-format msgid "No available resolutions" msgstr "Нема доступних резолуција." #. i18n: ectx: property (windowTitle), widget (QDialog, Scaling) #: src/scaling.ui:14 +#, kde-format msgid "Dialog" msgstr "Дијалог" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: src/scaling.ui:20 +#, kde-format msgid "Screen Scaling" msgstr "Скалирање екрана" #. i18n: ectx: property (text), widget (QLabel, label) #: src/scaling.ui:31 +#, kde-format msgid "Scale:" msgstr "Размера:" #. i18n: ectx: property (text), widget (QLabel, scaleLabel) #: src/scaling.ui:72 +#, kde-format msgid "TextLabel" msgstr "TextLabel" #: src/scalingconfig.cpp:40 +#, kde-format msgid "Scaling changes will come into effect after restart" msgstr "Промене у величини ступиће на снагу по поновном покретању." #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:19 +#, kde-format msgid "Tab 1" msgstr "Језичак 1" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1) #: src/stylepreview.ui:29 +#, kde-format msgid "Group Box" msgstr "Оквир групе" #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1) #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2) #: src/stylepreview.ui:35 src/stylepreview.ui:45 +#, kde-format msgid "Radio button" msgstr "Радио дугме" #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1) #: src/stylepreview.ui:62 +#, kde-format msgid "Checkbox" msgstr "Кућица" #. i18n: ectx: property (text), widget (QPushButton, PushButton1) #: src/stylepreview.ui:115 +#, kde-format msgid "Button" msgstr "Дугме" #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1) #: src/stylepreview.ui:125 +#, kde-format msgid "Combobox" msgstr "Списак" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:155 +#, kde-format msgid "Tab 2" msgstr "Језичак 2" #: src/widget.cpp:90 +#, kde-format msgid "Primary display:" msgstr "Примарни екран:" #: src/widget.cpp:103 +#, kde-format msgid "Active profile" msgstr "Активни профил" -#: src/widget.cpp:112 src/widget.cpp:271 +#: src/widget.cpp:112 src/widget.cpp:272 +#, kde-format msgid "Unify Outputs" msgstr "Сједини излазе" #: src/widget.cpp:120 +#, kde-format msgid "Scale Display" msgstr "Скалирај екран" -#: src/widget.cpp:311 +#: src/widget.cpp:312 +#, kde-format msgid "Break Unified Outputs" msgstr "Растави сједињене излазе" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@ijekavian/kscreen.po kscreen-5.8.5/po/sr@ijekavian/kscreen.po --- kscreen-5.8.4/po/sr@ijekavian/kscreen.po 2016-11-22 11:12:20.000000000 +0100 +++ kscreen-5.8.5/po/sr@ijekavian/kscreen.po 2016-12-27 12:25:20.000000000 +0100 @@ -1,11 +1,11 @@ # Translation of kscreen.po into Serbian. -# Chusslove Illich <caslav.i...@gmx.net>, 2015. +# Chusslove Illich <caslav.i...@gmx.net>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-10 07:52+0000\n" -"PO-Revision-Date: 2015-01-17 13:25+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" +"PO-Revision-Date: 2016-11-23 19:27+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" "Language: sr@ijekavian\n" @@ -19,15 +19,18 @@ "X-Environment: kde\n" #: daemon.cpp:90 +#, kde-format msgid "Switch Display" msgstr "Промени екран" -#: daemon.cpp:235 +#: daemon.cpp:246 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" -msgstr "" +msgstr "Нема спољашњег екрана" -#: daemon.cpp:237 +#: daemon.cpp:248 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" -msgstr "" \ No newline at end of file +msgstr "Промена распореда екрана" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@ijekavian/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.8.5/po/sr@ijekavian/plasma_applet_org.kde.plasma.kscreen.po --- kscreen-5.8.4/po/sr@ijekavian/plasma_applet_org.kde.plasma.kscreen.po 2016-11-22 11:12:20.000000000 +0100 +++ kscreen-5.8.5/po/sr@ijekavian/plasma_applet_org.kde.plasma.kscreen.po 2016-12-27 12:25:20.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasma_applet_org.kde.plasma.kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-09 08:30+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -19,10 +19,12 @@ "X-Environment: kde\n" #: kscreenapplet.cpp:82 +#, kde-format msgid "Failed to connect to KScreen daemon" msgstr "Не могу да се повежем са К‑екрановим демоном." #: kscreenapplet.cpp:96 +#, kde-format msgid "Failed to load root object" msgstr "Не могу да учитам корени објекат." @@ -33,30 +35,36 @@ msgstr "Откривен је нов екран %1." #: package/contents/ui/main.qml:91 +#, kde-format msgctxt "Places the newly connected screen right of the existing one" msgid "Extend to Right" msgstr "Прошири удесно" #: package/contents/ui/main.qml:101 +#, kde-format msgctxt "Places the newly connected screen left of the existing one" msgid "Extend to Left" msgstr "Прошири улево" #: package/contents/ui/main.qml:111 +#, kde-format msgctxt "Makes the newly conencted screen a clone of the primary one" msgid "Clone Primary Output" msgstr "Клонирај примарни излаз" #: package/contents/ui/main.qml:121 +#, kde-format msgctxt "Disables the newly connected screen" msgid "Disable" msgstr "Деактивирај" #: package/contents/ui/main.qml:131 +#, kde-format msgid "No Action" msgstr "Без радње" #: package/contents/ui/main.qml:141 +#, kde-format msgctxt "Opens KScreen KCM" msgid "Advanced Configuration" msgstr "Напредно подешавање" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@ijekavianlatin/kcm_displayconfiguration.po kscreen-5.8.5/po/sr@ijekavianlatin/kcm_displayconfiguration.po --- kscreen-5.8.4/po/sr@ijekavianlatin/kcm_displayconfiguration.po 2016-11-22 11:12:24.000000000 +0100 +++ kscreen-5.8.5/po/sr@ijekavianlatin/kcm_displayconfiguration.po 2016-12-27 12:25:18.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kcm_displayconfiguration\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-14 07:13+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,10 +18,12 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" +#, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Časlav Ilić" +#, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "caslav.i...@gmx.net" @@ -47,57 +49,70 @@ msgstr "Identifikuj izlaze" #: qml/Output.qml:231 src/unifiedoutputconfig.cpp:84 +#, kde-format msgid "Unified Outputs" msgstr "Sjedinjeni izlazi" # >> @item #: qml/Output.qml:233 src/utils.cpp:37 +#, kde-format msgid "Laptop Screen" msgstr "ekran laptopa" #: src/kcm_kscreen.cpp:60 +#, kde-format msgid "Display Configuration" msgstr "Postava ekrana" #: src/kcm_kscreen.cpp:61 +#, kde-format msgid "Configuration for displays" msgstr "Podešavanje za ekrane" #: src/kcm_kscreen.cpp:62 +#, kde-format msgid "(c), 2012-2013 Daniel Vrátil" msgstr "© 2012–2013, Danijel Vratil" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Daniel Vrátil" msgstr "Danijel Vratil" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Maintainer" msgstr "Održavalac" #: src/kcm_kscreen.cpp:79 +#, kde-format msgid "No kscreen backend found. Please check your kscreen installation." msgstr "Nije nađena nijedna pozadina K‑ekrana. Proverite instalaciju." #: src/kcm_kscreen.cpp:132 +#, kde-format msgid "Are you sure you want to disable all outputs?" msgstr "Želite li zaista da isključite sve izlaze?" #: src/kcm_kscreen.cpp:133 +#, kde-format msgctxt "@title:window" msgid "Disable All Outputs" msgstr "Isključivanje svih izlaza" #: src/kcm_kscreen.cpp:134 +#, kde-format msgid "&Disable All Outputs" msgstr "&Isključi sve izlaze" #: src/kcm_kscreen.cpp:135 +#, kde-format msgid "&Reconfigure" msgstr "&Podesi ponovo" # rewrite-msgid: /GPU/graphics card/ #: src/kcm_kscreen.cpp:144 +#, kde-format msgid "" "Sorry, your configuration could not be applied.\n" "\n" @@ -110,61 +125,74 @@ "nego što grafička kartica podržava." #: src/kcm_kscreen.cpp:146 +#, kde-format msgctxt "@title:window" msgid "Unsupported Configuration" msgstr "Nepodržana postava" #: src/kcm_testapp.cpp:34 +#, kde-format msgid "KCM Test App" msgstr "KCM probni program" # >> @item #: src/outputconfig.cpp:101 +#, kde-format msgid "Enabled" msgstr "uključen" #: src/outputconfig.cpp:109 +#, kde-format msgid "Display:" msgstr "Ekran:" #: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:94 +#, kde-format msgid "Resolution:" msgstr "Rezolucija:" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:101 +#, kde-format msgid "Normal" msgstr "normalno" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:118 src/unifiedoutputconfig.cpp:102 +#, kde-format msgid "90° Clockwise" msgstr "90° kazaljke sata" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:119 src/unifiedoutputconfig.cpp:103 +#, kde-format msgid "Upside Down" msgstr "izvrnuto" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:120 src/unifiedoutputconfig.cpp:104 +#, kde-format msgid "90° Counterclockwise" msgstr "90° suprotno kazaljke sata" #: src/outputconfig.cpp:125 src/unifiedoutputconfig.cpp:105 +#, kde-format msgid "Orientation:" msgstr "Orijentacija:" #: src/outputconfig.cpp:129 +#, kde-format msgid "Advanced Settings" msgstr "Napredne postavke" # >> @item:inlistbox Refresh rate: #: src/outputconfig.cpp:144 +#, kde-format msgid "Auto" msgstr "automatski" #: src/outputconfig.cpp:145 +#, kde-format msgid "Refresh rate:" msgstr "Osvežavanje:" @@ -175,89 +203,108 @@ # >> @item:inlistbox #: src/primaryoutputcombo.cpp:38 src/primaryoutputcombo.cpp:55 +#, kde-format msgid "No Primary Output" msgstr "bez primarnog izlaza" #: src/resolutionslider.cpp:83 +#, kde-format msgid "No available resolutions" msgstr "Nema dostupnih rezolucija." #. i18n: ectx: property (windowTitle), widget (QDialog, Scaling) #: src/scaling.ui:14 +#, kde-format msgid "Dialog" msgstr "Dijalog" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: src/scaling.ui:20 +#, kde-format msgid "Screen Scaling" msgstr "Skaliranje ekrana" #. i18n: ectx: property (text), widget (QLabel, label) #: src/scaling.ui:31 +#, kde-format msgid "Scale:" msgstr "Razmera:" #. i18n: ectx: property (text), widget (QLabel, scaleLabel) #: src/scaling.ui:72 +#, kde-format msgid "TextLabel" msgstr "TextLabel" #: src/scalingconfig.cpp:40 +#, kde-format msgid "Scaling changes will come into effect after restart" msgstr "Promene u veličini stupiće na snagu po ponovnom pokretanju." #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:19 +#, kde-format msgid "Tab 1" msgstr "Jezičak 1" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1) #: src/stylepreview.ui:29 +#, kde-format msgid "Group Box" msgstr "Okvir grupe" #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1) #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2) #: src/stylepreview.ui:35 src/stylepreview.ui:45 +#, kde-format msgid "Radio button" msgstr "Radio dugme" #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1) #: src/stylepreview.ui:62 +#, kde-format msgid "Checkbox" msgstr "Kućica" #. i18n: ectx: property (text), widget (QPushButton, PushButton1) #: src/stylepreview.ui:115 +#, kde-format msgid "Button" msgstr "Dugme" #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1) #: src/stylepreview.ui:125 +#, kde-format msgid "Combobox" msgstr "Spisak" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:155 +#, kde-format msgid "Tab 2" msgstr "Jezičak 2" #: src/widget.cpp:90 +#, kde-format msgid "Primary display:" msgstr "Primarni ekran:" #: src/widget.cpp:103 +#, kde-format msgid "Active profile" msgstr "Aktivni profil" -#: src/widget.cpp:112 src/widget.cpp:271 +#: src/widget.cpp:112 src/widget.cpp:272 +#, kde-format msgid "Unify Outputs" msgstr "Sjedini izlaze" #: src/widget.cpp:120 +#, kde-format msgid "Scale Display" msgstr "Skaliraj ekran" -#: src/widget.cpp:311 +#: src/widget.cpp:312 +#, kde-format msgid "Break Unified Outputs" msgstr "Rastavi sjedinjene izlaze" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@ijekavianlatin/kscreen.po kscreen-5.8.5/po/sr@ijekavianlatin/kscreen.po --- kscreen-5.8.4/po/sr@ijekavianlatin/kscreen.po 2016-11-22 11:12:24.000000000 +0100 +++ kscreen-5.8.5/po/sr@ijekavianlatin/kscreen.po 2016-12-27 12:25:18.000000000 +0100 @@ -1,11 +1,11 @@ # Translation of kscreen.po into Serbian. -# Chusslove Illich <caslav.i...@gmx.net>, 2015. +# Chusslove Illich <caslav.i...@gmx.net>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-10 07:52+0000\n" -"PO-Revision-Date: 2015-01-17 13:25+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" +"PO-Revision-Date: 2016-11-23 19:27+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" "Language: sr@ijekavianlatin\n" @@ -19,15 +19,18 @@ "X-Environment: kde\n" #: daemon.cpp:90 +#, kde-format msgid "Switch Display" msgstr "Promeni ekran" -#: daemon.cpp:235 +#: daemon.cpp:246 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" -msgstr "" +msgstr "Nema spoljašnjeg ekrana" -#: daemon.cpp:237 +#: daemon.cpp:248 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" -msgstr "" \ No newline at end of file +msgstr "Promena rasporeda ekrana" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@ijekavianlatin/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.8.5/po/sr@ijekavianlatin/plasma_applet_org.kde.plasma.kscreen.po --- kscreen-5.8.4/po/sr@ijekavianlatin/plasma_applet_org.kde.plasma.kscreen.po 2016-11-22 11:12:24.000000000 +0100 +++ kscreen-5.8.5/po/sr@ijekavianlatin/plasma_applet_org.kde.plasma.kscreen.po 2016-12-27 12:25:18.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasma_applet_org.kde.plasma.kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-09 08:30+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -19,10 +19,12 @@ "X-Environment: kde\n" #: kscreenapplet.cpp:82 +#, kde-format msgid "Failed to connect to KScreen daemon" msgstr "Ne mogu da se povežem sa K‑ekranovim demonom." #: kscreenapplet.cpp:96 +#, kde-format msgid "Failed to load root object" msgstr "Ne mogu da učitam koreni objekat." @@ -33,30 +35,36 @@ msgstr "Otkriven je nov ekran %1." #: package/contents/ui/main.qml:91 +#, kde-format msgctxt "Places the newly connected screen right of the existing one" msgid "Extend to Right" msgstr "Proširi udesno" #: package/contents/ui/main.qml:101 +#, kde-format msgctxt "Places the newly connected screen left of the existing one" msgid "Extend to Left" msgstr "Proširi ulevo" #: package/contents/ui/main.qml:111 +#, kde-format msgctxt "Makes the newly conencted screen a clone of the primary one" msgid "Clone Primary Output" msgstr "Kloniraj primarni izlaz" #: package/contents/ui/main.qml:121 +#, kde-format msgctxt "Disables the newly connected screen" msgid "Disable" msgstr "Deaktiviraj" #: package/contents/ui/main.qml:131 +#, kde-format msgid "No Action" msgstr "Bez radnje" #: package/contents/ui/main.qml:141 +#, kde-format msgctxt "Opens KScreen KCM" msgid "Advanced Configuration" msgstr "Napredno podešavanje" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@latin/kcm_displayconfiguration.po kscreen-5.8.5/po/sr@latin/kcm_displayconfiguration.po --- kscreen-5.8.4/po/sr@latin/kcm_displayconfiguration.po 2016-11-22 11:12:21.000000000 +0100 +++ kscreen-5.8.5/po/sr@latin/kcm_displayconfiguration.po 2016-12-27 12:25:19.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kcm_displayconfiguration\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-14 07:13+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2016-04-15 23:42+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,10 +18,12 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" +#, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" msgstr "Časlav Ilić" +#, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "caslav.i...@gmx.net" @@ -47,57 +49,70 @@ msgstr "Identifikuj izlaze" #: qml/Output.qml:231 src/unifiedoutputconfig.cpp:84 +#, kde-format msgid "Unified Outputs" msgstr "Sjedinjeni izlazi" # >> @item #: qml/Output.qml:233 src/utils.cpp:37 +#, kde-format msgid "Laptop Screen" msgstr "ekran laptopa" #: src/kcm_kscreen.cpp:60 +#, kde-format msgid "Display Configuration" msgstr "Postava ekrana" #: src/kcm_kscreen.cpp:61 +#, kde-format msgid "Configuration for displays" msgstr "Podešavanje za ekrane" #: src/kcm_kscreen.cpp:62 +#, kde-format msgid "(c), 2012-2013 Daniel Vrátil" msgstr "© 2012–2013, Danijel Vratil" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Daniel Vrátil" msgstr "Danijel Vratil" #: src/kcm_kscreen.cpp:64 +#, kde-format msgid "Maintainer" msgstr "Održavalac" #: src/kcm_kscreen.cpp:79 +#, kde-format msgid "No kscreen backend found. Please check your kscreen installation." msgstr "Nije nađena nijedna pozadina K‑ekrana. Proverite instalaciju." #: src/kcm_kscreen.cpp:132 +#, kde-format msgid "Are you sure you want to disable all outputs?" msgstr "Želite li zaista da isključite sve izlaze?" #: src/kcm_kscreen.cpp:133 +#, kde-format msgctxt "@title:window" msgid "Disable All Outputs" msgstr "Isključivanje svih izlaza" #: src/kcm_kscreen.cpp:134 +#, kde-format msgid "&Disable All Outputs" msgstr "&Isključi sve izlaze" #: src/kcm_kscreen.cpp:135 +#, kde-format msgid "&Reconfigure" msgstr "&Podesi ponovo" # rewrite-msgid: /GPU/graphics card/ #: src/kcm_kscreen.cpp:144 +#, kde-format msgid "" "Sorry, your configuration could not be applied.\n" "\n" @@ -110,61 +125,74 @@ "nego što grafička kartica podržava." #: src/kcm_kscreen.cpp:146 +#, kde-format msgctxt "@title:window" msgid "Unsupported Configuration" msgstr "Nepodržana postava" #: src/kcm_testapp.cpp:34 +#, kde-format msgid "KCM Test App" msgstr "KCM probni program" # >> @item #: src/outputconfig.cpp:101 +#, kde-format msgid "Enabled" msgstr "uključen" #: src/outputconfig.cpp:109 +#, kde-format msgid "Display:" msgstr "Ekran:" #: src/outputconfig.cpp:114 src/unifiedoutputconfig.cpp:94 +#, kde-format msgid "Resolution:" msgstr "Rezolucija:" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:117 src/unifiedoutputconfig.cpp:101 +#, kde-format msgid "Normal" msgstr "normalno" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:118 src/unifiedoutputconfig.cpp:102 +#, kde-format msgid "90° Clockwise" msgstr "90° kazaljke sata" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:119 src/unifiedoutputconfig.cpp:103 +#, kde-format msgid "Upside Down" msgstr "izvrnuto" # >> @item:inlistbox Orientation: #: src/outputconfig.cpp:120 src/unifiedoutputconfig.cpp:104 +#, kde-format msgid "90° Counterclockwise" msgstr "90° suprotno kazaljke sata" #: src/outputconfig.cpp:125 src/unifiedoutputconfig.cpp:105 +#, kde-format msgid "Orientation:" msgstr "Orijentacija:" #: src/outputconfig.cpp:129 +#, kde-format msgid "Advanced Settings" msgstr "Napredne postavke" # >> @item:inlistbox Refresh rate: #: src/outputconfig.cpp:144 +#, kde-format msgid "Auto" msgstr "automatski" #: src/outputconfig.cpp:145 +#, kde-format msgid "Refresh rate:" msgstr "Osvežavanje:" @@ -175,89 +203,108 @@ # >> @item:inlistbox #: src/primaryoutputcombo.cpp:38 src/primaryoutputcombo.cpp:55 +#, kde-format msgid "No Primary Output" msgstr "bez primarnog izlaza" #: src/resolutionslider.cpp:83 +#, kde-format msgid "No available resolutions" msgstr "Nema dostupnih rezolucija." #. i18n: ectx: property (windowTitle), widget (QDialog, Scaling) #: src/scaling.ui:14 +#, kde-format msgid "Dialog" msgstr "Dijalog" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: src/scaling.ui:20 +#, kde-format msgid "Screen Scaling" msgstr "Skaliranje ekrana" #. i18n: ectx: property (text), widget (QLabel, label) #: src/scaling.ui:31 +#, kde-format msgid "Scale:" msgstr "Razmera:" #. i18n: ectx: property (text), widget (QLabel, scaleLabel) #: src/scaling.ui:72 +#, kde-format msgid "TextLabel" msgstr "TextLabel" #: src/scalingconfig.cpp:40 +#, kde-format msgid "Scaling changes will come into effect after restart" msgstr "Promene u veličini stupiće na snagu po ponovnom pokretanju." #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:19 +#, kde-format msgid "Tab 1" msgstr "Jezičak 1" #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1) #: src/stylepreview.ui:29 +#, kde-format msgid "Group Box" msgstr "Okvir grupe" #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1) #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2) #: src/stylepreview.ui:35 src/stylepreview.ui:45 +#, kde-format msgid "Radio button" msgstr "Radio dugme" #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1) #: src/stylepreview.ui:62 +#, kde-format msgid "Checkbox" msgstr "Kućica" #. i18n: ectx: property (text), widget (QPushButton, PushButton1) #: src/stylepreview.ui:115 +#, kde-format msgid "Button" msgstr "Dugme" #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1) #: src/stylepreview.ui:125 +#, kde-format msgid "Combobox" msgstr "Spisak" #. i18n: ectx: attribute (title), widget (QWidget, tab) #: src/stylepreview.ui:155 +#, kde-format msgid "Tab 2" msgstr "Jezičak 2" #: src/widget.cpp:90 +#, kde-format msgid "Primary display:" msgstr "Primarni ekran:" #: src/widget.cpp:103 +#, kde-format msgid "Active profile" msgstr "Aktivni profil" -#: src/widget.cpp:112 src/widget.cpp:271 +#: src/widget.cpp:112 src/widget.cpp:272 +#, kde-format msgid "Unify Outputs" msgstr "Sjedini izlaze" #: src/widget.cpp:120 +#, kde-format msgid "Scale Display" msgstr "Skaliraj ekran" -#: src/widget.cpp:311 +#: src/widget.cpp:312 +#, kde-format msgid "Break Unified Outputs" msgstr "Rastavi sjedinjene izlaze" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@latin/kscreen.po kscreen-5.8.5/po/sr@latin/kscreen.po --- kscreen-5.8.4/po/sr@latin/kscreen.po 2016-11-22 11:12:21.000000000 +0100 +++ kscreen-5.8.5/po/sr@latin/kscreen.po 2016-12-27 12:25:19.000000000 +0100 @@ -1,11 +1,11 @@ # Translation of kscreen.po into Serbian. -# Chusslove Illich <caslav.i...@gmx.net>, 2015. +# Chusslove Illich <caslav.i...@gmx.net>, 2015, 2016. msgid "" msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-09-10 07:52+0000\n" -"PO-Revision-Date: 2015-01-17 13:25+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" +"PO-Revision-Date: 2016-11-23 19:27+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" "Language: sr@latin\n" @@ -19,15 +19,18 @@ "X-Environment: kde\n" #: daemon.cpp:90 +#, kde-format msgid "Switch Display" msgstr "Promeni ekran" -#: daemon.cpp:235 +#: daemon.cpp:246 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" -msgstr "" +msgstr "Nema spoljašnjeg ekrana" -#: daemon.cpp:237 +#: daemon.cpp:248 +#, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" -msgstr "" \ No newline at end of file +msgstr "Promena rasporeda ekrana" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sr@latin/plasma_applet_org.kde.plasma.kscreen.po kscreen-5.8.5/po/sr@latin/plasma_applet_org.kde.plasma.kscreen.po --- kscreen-5.8.4/po/sr@latin/plasma_applet_org.kde.plasma.kscreen.po 2016-11-22 11:12:21.000000000 +0100 +++ kscreen-5.8.5/po/sr@latin/plasma_applet_org.kde.plasma.kscreen.po 2016-12-27 12:25:19.000000000 +0100 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: plasma_applet_org.kde.plasma.kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-01-09 08:30+0000\n" +"POT-Creation-Date: 2016-11-19 22:52+0100\n" "PO-Revision-Date: 2015-01-17 13:25+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -19,10 +19,12 @@ "X-Environment: kde\n" #: kscreenapplet.cpp:82 +#, kde-format msgid "Failed to connect to KScreen daemon" msgstr "Ne mogu da se povežem sa K‑ekranovim demonom." #: kscreenapplet.cpp:96 +#, kde-format msgid "Failed to load root object" msgstr "Ne mogu da učitam koreni objekat." @@ -33,30 +35,36 @@ msgstr "Otkriven je nov ekran %1." #: package/contents/ui/main.qml:91 +#, kde-format msgctxt "Places the newly connected screen right of the existing one" msgid "Extend to Right" msgstr "Proširi udesno" #: package/contents/ui/main.qml:101 +#, kde-format msgctxt "Places the newly connected screen left of the existing one" msgid "Extend to Left" msgstr "Proširi ulevo" #: package/contents/ui/main.qml:111 +#, kde-format msgctxt "Makes the newly conencted screen a clone of the primary one" msgid "Clone Primary Output" msgstr "Kloniraj primarni izlaz" #: package/contents/ui/main.qml:121 +#, kde-format msgctxt "Disables the newly connected screen" msgid "Disable" msgstr "Deaktiviraj" #: package/contents/ui/main.qml:131 +#, kde-format msgid "No Action" msgstr "Bez radnje" #: package/contents/ui/main.qml:141 +#, kde-format msgctxt "Opens KScreen KCM" msgid "Advanced Configuration" msgstr "Napredno podešavanje" \ No newline at end of file diff -Nru kscreen-5.8.4/po/sv/kscreen.po kscreen-5.8.5/po/sv/kscreen.po --- kscreen-5.8.4/po/sv/kscreen.po 2016-11-22 11:12:26.000000000 +0100 +++ kscreen-5.8.5/po/sv/kscreen.po 2016-12-27 12:25:19.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-10 14:22+0100\n" "Last-Translator: Stefan Asserhäll <stefan.asserh...@bredband.net>\n" "Language-Team: Swedish <kde-i18n-...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Byt bildskärm" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Ingen extern bildskärm" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/tr/kscreen.po kscreen-5.8.5/po/tr/kscreen.po --- kscreen-5.8.4/po/tr/kscreen.po 2016-11-22 11:12:56.000000000 +0100 +++ kscreen-5.8.5/po/tr/kscreen.po 2016-12-27 12:25:23.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2015-02-08 14:01+0100\n" "Last-Translator: Volkan Gezer <volkange...@gmail.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "Ekranı Değiştir" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/uk/kscreen.po kscreen-5.8.5/po/uk/kscreen.po --- kscreen-5.8.4/po/uk/kscreen.po 2016-11-22 11:12:54.000000000 +0100 +++ kscreen-5.8.5/po/uk/kscreen.po 2016-12-27 12:25:23.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kscreen\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-10 12:51+0300\n" "Last-Translator: Yuri Chornoivan <yurc...@ukr.net>\n" "Language-Team: Ukrainian <kde-i18n...@kde.org>\n" @@ -25,13 +25,13 @@ msgid "Switch Display" msgstr "Перемкнути дисплей" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "Немає зовнішніх дисплеїв" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/zh_CN/kscreen.po kscreen-5.8.5/po/zh_CN/kscreen.po --- kscreen-5.8.4/po/zh_CN/kscreen.po 2016-11-22 11:13:09.000000000 +0100 +++ kscreen-5.8.5/po/zh_CN/kscreen.po 2016-12-27 12:25:25.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-10-04 12:02-0800\n" "Last-Translator: Weng Xuetian <wen...@gmail.com>\n" "Language-Team: Chinese <kde-ch...@kde.org>\n" @@ -22,13 +22,13 @@ msgid "Switch Display" msgstr "切换显示器" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "无外部显示" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout" diff -Nru kscreen-5.8.4/po/zh_TW/kscreen.po kscreen-5.8.5/po/zh_TW/kscreen.po --- kscreen-5.8.4/po/zh_TW/kscreen.po 2016-11-22 11:13:12.000000000 +0100 +++ kscreen-5.8.5/po/zh_TW/kscreen.po 2016-12-27 12:25:26.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2016-11-19 22:52+0100\n" +"POT-Creation-Date: 2016-11-24 04:52+0100\n" "PO-Revision-Date: 2016-09-20 10:34+0800\n" "Last-Translator: Jeff Huang <s8321...@gmail.com>\n" "Language-Team: Chinese <kde-i18n-...@kde.org>\n" @@ -23,13 +23,13 @@ msgid "Switch Display" msgstr "切換顯示" -#: daemon.cpp:235 +#: daemon.cpp:246 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "No External Display" msgstr "沒有外部顯示器" -#: daemon.cpp:237 +#: daemon.cpp:248 #, kde-format msgctxt "OSD text after XF86Display button press" msgid "Changing Screen Layout"
diff --git a/debian/changelog b/debian/changelog index f00d9cf..cff34c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,3 @@ -kscreen (4:5.8.5-2) unstable; urgency=medium - - * Add upower as a recommends. - Thanks to Éter for reporting (Closes: 853171) - - -- Maximiliano Curia <m...@debian.org> Mon, 13 Mar 2017 14:20:57 +0100 - -kscreen (4:5.8.5-1) experimental; urgency=medium - - * New upstream release (5.8.5). - - -- Maximiliano Curia <m...@debian.org> Fri, 30 Dec 2016 18:46:16 +0100 - kscreen (4:5.8.4-1) unstable; urgency=medium * New upstream release (5.8.4) diff --git a/debian/control b/debian/control index 7955748..d3b0ee7 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,6 @@ Depends: kde-cli-tools, qml-module-qtgraphicaleffects, ${misc:Depends}, ${shlibs:Depends} -Recommends: upower Description: KDE monitor hotplug and screen handling KScreen provides multiple monitor support. This support tries to be as smart as possible adapting the behavior of it to each use case
commit fdaff1f4691c009db5f7a1182342b8e4bb62336e Merge: e6b5a1a aebfffb Author: Automatic packaging <maxy+jenk...@gnuservers.com.ar> Date: Tue Dec 27 15:00:09 2016 +0100 New upstream version 5.8.5 commit aebfffbf1867f73069ec87f441394bbc1064c2e0 Author: Jonathan Riddell <j...@jriddell.org> Date: Tue Dec 27 09:25:27 2016 +0000 Update version number for 5.8.5 GIT_SILENT diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a715b5..c1e99a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(KScreen) -set(PROJECT_VERSION "5.8.4") +set(PROJECT_VERSION "5.8.5") cmake_minimum_required(VERSION 2.8.12) commit 906dafff46ebb707043117eace8d97ab05dd14e2 Author: l10n daemon script <scri...@kde.org> Date: Wed Dec 21 07:41:43 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/kcm/kcm_kscreen.desktop.cmake b/kcm/kcm_kscreen.desktop.cmake index c82f777..e92570e 100644 --- a/kcm/kcm_kscreen.desktop.cmake +++ b/kcm/kcm_kscreen.desktop.cmake @@ -28,6 +28,7 @@ Name[nl]=Schermen Name[nn]=Skjermar Name[pl]=Ekrany Name[pt]=Ecrãs +Name[pt_BR]=Telas Name[ru]=Экраны Name[sk]=Obrazovky Name[sl]=Zasloni commit b681543f2bf5232b1702ae437bed806a53017855 Author: l10n daemon script <scri...@kde.org> Date: Fri Dec 9 05:11:56 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/kcm/kcm_kscreen.desktop.cmake b/kcm/kcm_kscreen.desktop.cmake index 90a73a2..c82f777 100644 --- a/kcm/kcm_kscreen.desktop.cmake +++ b/kcm/kcm_kscreen.desktop.cmake @@ -18,6 +18,7 @@ Name[de]=Anzeigen Name[el]=Οθόνες Name[en_GB]=Displays Name[es]=Pantallas +Name[et]=Monitorid Name[fi]=Näytöt Name[fr]=Affichages Name[it]=Schermi commit dcb952b40fbc8c7b00236bf20e8d82c9441d761e Author: l10n daemon script <scri...@kde.org> Date: Mon Dec 5 05:12:58 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/kcm/kcm_kscreen.desktop.cmake b/kcm/kcm_kscreen.desktop.cmake index 517e841..90a73a2 100644 --- a/kcm/kcm_kscreen.desktop.cmake +++ b/kcm/kcm_kscreen.desktop.cmake @@ -38,7 +38,7 @@ Name[sv]=Bildskärmar Name[uk]=Дисплеї Name[x-test]=xxDisplaysxx Name[zh_CN]=显示 -Name[zh_TW]=顯市示 +Name[zh_TW]=顯示 Comment=Manage and configure monitors and displays Comment[ar]=أدر واضبط الشّاشات والعروض Comment[ast]=Xestiona y configura los monitores y pantalles commit 56bd4daa5edb8de3b44a7ac87543bbe2be648b2c Author: l10n daemon script <scri...@kde.org> Date: Tue Nov 29 05:45:41 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/kcm/kcm_kscreen.desktop.cmake b/kcm/kcm_kscreen.desktop.cmake index 7844ed8..517e841 100644 --- a/kcm/kcm_kscreen.desktop.cmake +++ b/kcm/kcm_kscreen.desktop.cmake @@ -30,6 +30,10 @@ Name[pt]=Ecrãs Name[ru]=Экраны Name[sk]=Obrazovky Name[sl]=Zasloni +Name[sr]=Екрани +Name[sr@ijekavian]=Екрани +Name[sr@ijekavianlatin]=Ekrani +Name[sr@latin]=Ekrani Name[sv]=Bildskärmar Name[uk]=Дисплеї Name[x-test]=xxDisplaysxx commit d79dc2b8ca4f8c9daf6c6e6f5f3e40580f6d224c Author: Sebastian Kügler <se...@kde.org> Date: Sun Nov 27 23:17:25 2016 +0100 guard against nullptr-access to the OutputPtr output may be null here, as we don't necessarily have a primary display. Guard against that case. Patch by Jan-Matthias Braun, thanks! CCMAIL:jan_br...@gmx.net BUG:372945 FIXED-IN:5.8.5 diff --git a/console/console.cpp b/console/console.cpp index 4388501..af9c446 100644 --- a/console/console.cpp +++ b/console/console.cpp @@ -71,7 +71,12 @@ void Console::printConfig() connect(m_config.data(), &Config::primaryOutputChanged, [&](const OutputPtr &output) { - qDebug() << "New primary output: " << output->id() << output->name(); + if (output) { + qDebug() << "New primary output: " + << output->id() << output->name(); + } else { + qDebug() << "No primary output."; + } }); qDebug() << "Screen:"; commit 290942907bef849bc0b9c14d61668249610691fa Author: l10n daemon script <scri...@kde.org> Date: Fri Nov 25 06:39:20 2016 +0100 SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" diff --git a/kcm/kcm_kscreen.desktop.cmake b/kcm/kcm_kscreen.desktop.cmake index b8248de..7844ed8 100644 --- a/kcm/kcm_kscreen.desktop.cmake +++ b/kcm/kcm_kscreen.desktop.cmake @@ -19,6 +19,7 @@ Name[el]=Οθόνες Name[en_GB]=Displays Name[es]=Pantallas Name[fi]=Näytöt +Name[fr]=Affichages Name[it]=Schermi Name[ko]=디스플레이 Name[lt]=Ekranai commit d5b9d37767adbf2a035281fbeb5f38a309160413 Author: Sebastian Kügler <se...@kde.org> Date: Thu Nov 17 03:37:06 2016 +0100 apply config change after correcting invalid mode The logic here to find and set the correct mode was OK, we just forgot to actually apply the changes. This change makes resizing plasmashell to the vm host window "kind of" work. When the window gets bigger it works, when either axis gets smaller, I'm getting a black screen (which can be corrected by making the window just a little bit bigger and triggering another modeset). This is a separate problem, however, since I can reproduce the exact same behaviour just using xrandr. This means, that we do now have all the bits and pieces in place for handling changes of modes at runtime. I'm not closing this bug just yet, since I want to give this some more testing exposure and possibly iron out some wrinks. CCBUG:356864 diff --git a/kded/daemon.cpp b/kded/daemon.cpp index 31e8ae2..ce82397 100644 --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -202,6 +202,7 @@ void KScreenDaemon::configChanged() if (output->isConnected() && output->isEnabled() && output->currentMode().isNull()) { qCDebug(KSCREEN_KDED) << "Current mode" << output->currentModeId() << "invalid, setting preferred mode" << output->preferredModeId(); output->setCurrentModeId(output->preferredModeId()); + doApplyConfig(m_monitoredConfig); } } commit b4b504696b638691ad96c75560e6599c44bea88c Author: Sebastian Kügler <se...@kde.org> Date: Fri Nov 11 00:55:56 2016 +0100 no use in setting modes on disabled outputs diff --git a/kded/daemon.cpp b/kded/daemon.cpp index d90299f..31e8ae2 100644 --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -199,8 +199,8 @@ void KScreenDaemon::configChanged() // Modes may have changed, fix-up current mode id Q_FOREACH(const KScreen::OutputPtr &output, m_monitoredConfig->outputs()) { - if (output->currentMode().isNull()) { - qCDebug(KSCREEN_KDED) << "Current mode" << output->setCurrentModeId << "invalid, setting preferred mode" << output->preferredModeId(); + if (output->isConnected() && output->isEnabled() && output->currentMode().isNull()) { + qCDebug(KSCREEN_KDED) << "Current mode" << output->currentModeId() << "invalid, setting preferred mode" << output->preferredModeId(); output->setCurrentModeId(output->preferredModeId()); } } commit 96db1a9a1aedcc3c5816af6fe69e7a9039daeda1 Author: Sebastian Kügler <se...@kde.org> Date: Thu Nov 10 17:10:30 2016 +0100 correct possibly invalid current mode When we get config change events, the list of modes might have changed. This happens for resizing virtual machine windows, for example). The current mode may now be invalid, in that case we set the output to the preferred mode (which in that case is the vm window's size). cherry-picked from master 23006c1b9bc6657 Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D2155 diff --git a/kded/daemon.cpp b/kded/daemon.cpp index 0c6140f..d90299f 100644 --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -196,6 +196,15 @@ void KScreenDaemon::configChanged() { qCDebug(KSCREEN_KDED) << "Change detected"; logConfig(m_monitoredConfig); + + // Modes may have changed, fix-up current mode id + Q_FOREACH(const KScreen::OutputPtr &output, m_monitoredConfig->outputs()) { + if (output->currentMode().isNull()) { + qCDebug(KSCREEN_KDED) << "Current mode" << output->setCurrentModeId << "invalid, setting preferred mode" << output->preferredModeId(); + output->setCurrentModeId(output->preferredModeId()); + } + } + // Reset timer, delay the writeback m_saveTimer->start(); } @@ -206,6 +215,7 @@ void KScreenDaemon::saveCurrentConfig() // We assume the config is valid, since it's what we got, but we are interested // in the "at least one enabled screen" check + const bool valid = KScreen::Config::canBeApplied(m_monitoredConfig, KScreen::Config::ValidityFlag::RequireAtLeastOneEnabledScreen); if (valid) { Serializer::saveConfig(m_monitoredConfig, Serializer::configId(m_monitoredConfig));