diff -Nru khotkeys-5.2.1/CMakeLists.txt khotkeys-5.2.2/CMakeLists.txt --- khotkeys-5.2.1/CMakeLists.txt 2015-02-21 19:39:25.000000000 +0000 +++ khotkeys-5.2.2/CMakeLists.txt 2015-03-19 15:02:03.000000000 +0000 @@ -1,5 +1,5 @@ project(khotkeys) -set(PROJECT_VERSION "5.2.1") +set(PROJECT_VERSION "5.2.2") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) diff -Nru khotkeys-5.2.1/data/kde32b1.khotkeys khotkeys-5.2.2/data/kde32b1.khotkeys --- khotkeys-5.2.1/data/kde32b1.khotkeys 2015-02-21 19:38:53.000000000 +0000 +++ khotkeys-5.2.2/data/kde32b1.khotkeys 2015-03-19 15:01:37.000000000 +0000 @@ -857,7 +857,7 @@ Comment[ast]=Esta aición executa Konsole, cuando se calca Ctrl+Alt+T. Comment[be@latin]=Hetaja aperacyja ŭklučaje prahramu „Konsole” ad klavijaturnaha skarotu „Ctrl+Alt+T”. Comment[bg]=Това действие стартира конзола при натискането на Ctrl+Alt+T. -Comment[bs]=Ova radnja pokreće Konzolu po pritisku Ctrl+Alt+T +Comment[bs]=Ova radnja pokreće Konzolu po pritisku Ctrl+Alt+T. Comment[ca]=Aquesta acció executa el Konsole, després de prémer Ctrl+Alt+T. Comment[ca@valencia]=Esta acció executa el Konsole, després de prémer Ctrl+Alt+T. Comment[cs]=Tato činnost spustí po stisknutí Ctrl-Alt-t program Konsole. diff -Nru khotkeys-5.2.1/data/konqueror_gestures_kde321.khotkeys khotkeys-5.2.2/data/konqueror_gestures_kde321.khotkeys --- khotkeys-5.2.1/data/konqueror_gestures_kde321.khotkeys 2015-02-21 19:38:53.000000000 +0000 +++ khotkeys-5.2.2/data/konqueror_gestures_kde321.khotkeys 2015-03-19 15:01:37.000000000 +0000 @@ -9,7 +9,7 @@ Comment[be]=Базавые жэсты Konqueror Comment[be@latin]=Prostyja žesty dla prahramy „Konqueror”. Comment[bg]=Основни жестове в Konqueror. -Comment[bs]=Osnovni gestovi u Konqueroru +Comment[bs]=Osnovni gestovi u Konqueroru. Comment[ca]=Gestos bàsics del Konqueror. Comment[ca@valencia]=Gestos bàsics del Konqueror. Comment[cs]=Základní gesta Konqueroru @@ -1968,7 +1968,7 @@ Comment[ast]=Calca, abaxo, arriba, abaxo, suelta. Comment[be@latin]=Pryciśni, pasuń uniz, pasuń uvierch, pasuń uniz i adciśni. Comment[bg]=Натискане, движение надолу, движение нагоре, движение надолу, пускане. -Comment[bs]=Pritisni, pomjeri dolje, pomjeri gore, pomjeri dolje, otpusti +Comment[bs]=Pritisni, pomjeri dolje, pomjeri gore, pomjeri dolje, otpusti. Comment[ca]=Premeu, moveu avall, moveu amunt, moveu avall, deixeu anar. Comment[ca@valencia]=Premeu, moveu avall, moveu amunt, moveu avall, deixeu anar. Comment[cs]=Stiskněte, pohněte dolů, pohněte nahoru, pohněte dolů, uvolněte. @@ -2223,7 +2223,7 @@ Comment[ast]=Calca, abaxo, arriba, suelta. Comment[be@latin]=Pryciśni, pasuń uniz, pasuń uvierch i adciśni. Comment[bg]=Натискане, движение надолу, движение нагоре, пускане. -Comment[bs]=Pritisni, pomjeri dolje, pomjeri gore, otpusti +Comment[bs]=Pritisni, pomjeri dolje, pomjeri gore, otpusti. Comment[ca]=Premeu, moveu avall, moveu amunt, deixeu anar. Comment[ca@valencia]=Premeu, moveu avall, moveu amunt, deixeu anar. Comment[cs]=Stiskněte, pohněte dolů, pohněte nahoru, uvolněte. @@ -2478,7 +2478,7 @@ Comment[ast]=Calca, derecha, suelta. Comment[be@latin]=Pryciśni, pasuń uprava j adciśni. Comment[bg]=Натискане, движение надясно, пускане. -Comment[bs]=Pritisni, pomjeri desno, otpusti +Comment[bs]=Pritisni, pomjeri desno, otpusti. Comment[ca]=Premeu, moveu a la dreta, deixeu anar. Comment[ca@valencia]=Premeu, moveu a la dreta, deixeu anar. Comment[cs]=Stiskněte, pohněte doprava, uvolněte. diff -Nru khotkeys-5.2.1/data/printscreen.khotkeys khotkeys-5.2.2/data/printscreen.khotkeys --- khotkeys-5.2.1/data/printscreen.khotkeys 2015-02-21 19:38:53.000000000 +0000 +++ khotkeys-5.2.2/data/printscreen.khotkeys 2015-03-19 15:01:37.000000000 +0000 @@ -177,7 +177,7 @@ Comment[be@latin]=Uklučaje prahramu „KSnapShot” pa nacisku klavišy „PrintScrn”. Comment[bg]=Стартиране на KSnapShot при натискане на клавиша "PrintScrn" Comment[bn_IN]=PrintScrn টেপা হলে KSnapShot আরম্ভ করা হবে -Comment[bs]=Pokreće K‑snimak po pritisku na PrintScreen +Comment[bs]=Pokreće K‑snimak po pritisku na PrintScreen. Comment[ca]=Executa el KSnapShot quan es prem ImprPant. Comment[ca@valencia]=Executa el KSnapShot quan es prem ImprPant. Comment[cs]=Po stisku PrintScreen spustí KSnapshot. diff -Nru khotkeys-5.2.1/debian/changelog khotkeys-5.2.2/debian/changelog --- khotkeys-5.2.1/debian/changelog 2015-02-23 17:39:00.000000000 +0000 +++ khotkeys-5.2.2/debian/changelog 2015-03-24 14:16:27.000000000 +0000 @@ -1,3 +1,9 @@ +khotkeys (4:5.2.2-0ubuntu1) vivid; urgency=medium + + * New upstream release + + -- Scarlett Clark Tue, 24 Mar 2015 07:16:27 -0700 + khotkeys (4:5.2.1-0ubuntu1) vivid; urgency=medium * New upstream release diff -Nru khotkeys-5.2.1/debian/control khotkeys-5.2.2/debian/control --- khotkeys-5.2.1/debian/control 2015-02-23 17:39:00.000000000 +0000 +++ khotkeys-5.2.2/debian/control 2015-03-24 14:16:27.000000000 +0000 @@ -15,7 +15,7 @@ libkf5kcmutils-dev (>= 5.2.0), libqt5x11extras5-dev, plasma-framework-dev (>= 5.2.0), - plasma-workspace-dev (>= 4:5.2.1), + plasma-workspace-dev (>= 4:5.2.2), pkg-kde-tools Standards-Version: 3.9.5 Section: kde diff -Nru khotkeys-5.2.1/debian/meta/upstream_scm.json khotkeys-5.2.2/debian/meta/upstream_scm.json --- khotkeys-5.2.1/debian/meta/upstream_scm.json 2015-02-23 17:39:00.000000000 +0000 +++ khotkeys-5.2.2/debian/meta/upstream_scm.json 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -{"branch":"Plasma/5.2"} \ No newline at end of file diff -Nru khotkeys-5.2.1/po/bs/khotkeys.po khotkeys-5.2.2/po/bs/khotkeys.po --- khotkeys-5.2.1/po/bs/khotkeys.po 2015-02-21 19:38:56.000000000 +0000 +++ khotkeys-5.2.2/po/bs/khotkeys.po 2015-03-19 15:01:40.000000000 +0000 @@ -14,14 +14,12 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Launchpad (build 16807)\n" -"X-Launchpad-Export-Date: 2013-10-19 05:18+0000\n" +"X-Generator: Launchpad (build 17341)\n" +"X-Launchpad-Export-Date: 2015-02-15 06:00+0000\n" "X-Associated-UI-Catalogs: kdelibs4\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" "X-Environment: kde\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -29,7 +27,7 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "caslav.ilic@gmx.net,samir.ribic@etf.unsa.ba" +msgstr "Caslav.ilic@gmx.net,samir.ribic@etf.unsa.ba" # >> @title:tab #: kcm_hotkeys/action_group_widget.cpp:30 @@ -86,19 +84,19 @@ #. i18n: ectx: property (text), widget (QRadioButton, active_radio) #: kcm_hotkeys/actions/keyboard_input_action_widget.ui:27 msgid "Active window" -msgstr "aktivni prozor" +msgstr "Aktivni prozor" # >> @option:radio Send Input To #. i18n: ectx: property (text), widget (QRadioButton, specific_radio) #: kcm_hotkeys/actions/keyboard_input_action_widget.ui:34 msgid "Specific window" -msgstr "određeni prozor" +msgstr "Određeni prozor" # >> @option:radio Send Input To #. i18n: ectx: property (text), widget (QRadioButton, action_radio) #: kcm_hotkeys/actions/keyboard_input_action_widget.ui:41 msgid "Action window" -msgstr "prozor radnje" +msgstr "Prozor radnje" #. i18n: ectx: property (text), widget (QLabel, applicationLabel) #: kcm_hotkeys/actions/menuentry_action_widget.ui:16 @@ -113,32 +111,32 @@ #: kcm_hotkeys/conditions/condition_type_menu.cpp:27 msgctxt "Condition type" msgid "Active Window ..." -msgstr "aktivni prozor ..." +msgstr "Aktivni prozor ..." #: kcm_hotkeys/conditions/condition_type_menu.cpp:29 msgctxt "Condition type" msgid "Existing Window ..." -msgstr "postojeći prozor ..." +msgstr "Postojeći prozor ..." #: kcm_hotkeys/conditions/condition_type_menu.cpp:31 msgctxt "Condition type" msgid "And" -msgstr "i" +msgstr "I" #: kcm_hotkeys/conditions/condition_type_menu.cpp:33 msgctxt "Condition type" msgid "Or" -msgstr "ili" +msgstr "Ili" #: kcm_hotkeys/conditions/condition_type_menu.cpp:35 msgctxt "Condition type" msgid "Not" -msgstr "ne" +msgstr "Ne" #: kcm_hotkeys/conditions/conditions_widget.cpp:80 msgctxt "Add a new condition" msgid "And" -msgstr "i" +msgstr "I" #. i18n: ectx: property (text), widget (QTreeWidget, tree) #: kcm_hotkeys/conditions/conditions_widget.ui:20 @@ -257,7 +255,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:39 msgctxt "window title is not important" msgid "Is Not Important" -msgstr "nije bitno" +msgstr "Nije bitno" # >> @item:inlistbox #. i18n: ectx: property (text), item, widget (QComboBox, window_title_combo) @@ -267,7 +265,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:90 #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:136 msgid "Contains" -msgstr "sadrži" +msgstr "Sadrži" # >> @item:inlistbox #. i18n: ectx: property (text), item, widget (QComboBox, window_title_combo) @@ -277,7 +275,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:95 #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:141 msgid "Is" -msgstr "jeste" +msgstr "Jeste" # >> @item:inlistbox #. i18n: ectx: property (text), item, widget (QComboBox, window_title_combo) @@ -287,7 +285,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:100 #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:146 msgid "Matches Regular Expression" -msgstr "poklapa regularni izraz" +msgstr "Poklapa regularni izraz" # >> @item:inlistbox #. i18n: ectx: property (text), item, widget (QComboBox, window_title_combo) @@ -297,7 +295,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:105 #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:151 msgid "Does Not Contain" -msgstr "ne sadrži" +msgstr "Ne sadrži" # >> @item:inlistbox #. i18n: ectx: property (text), item, widget (QComboBox, window_title_combo) @@ -307,7 +305,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:110 #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:156 msgid "Is Not" -msgstr "nije" +msgstr "Nije" # >> @item:inlistbox #. i18n: ectx: property (text), item, widget (QComboBox, window_title_combo) @@ -317,7 +315,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:115 #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:161 msgid "Does Not Match Regular Expression" -msgstr "ne poklapa regularni izraz" +msgstr "Ne poklapa regularni izraz" #. i18n: ectx: property (text), widget (QLabel, window_class_label) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:77 @@ -330,7 +328,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:85 msgctxt "window class is not important" msgid "Is Not Important" -msgstr "nije bitno" +msgstr "Nije bitno" #. i18n: ectx: property (text), widget (QLabel, window_role_label) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:123 @@ -343,7 +341,7 @@ #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:131 msgctxt "window role is not important" msgid "Is Not Important" -msgstr "nije bitno" +msgstr "Nije bitno" #. i18n: ectx: property (text), widget (QPushButton, autodetect) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:195 @@ -360,25 +358,25 @@ #. i18n: ectx: property (text), widget (QRadioButton, type_normal) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:211 msgid "Normal" -msgstr "običan" +msgstr "Običan" # >> @option:check Window Types #. i18n: ectx: property (text), widget (QRadioButton, type_desktop) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:218 msgid "Desktop" -msgstr "površ" +msgstr "Površ" # >> @option:check Window Types #. i18n: ectx: property (text), widget (QRadioButton, type_dialog) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:225 msgid "Dialog" -msgstr "dijalog" +msgstr "Dijalog" # >> @option:check Window Types #. i18n: ectx: property (text), widget (QRadioButton, type_dock) #: kcm_hotkeys/helper_widgets/window_definition_widget.ui:232 msgid "Dock" -msgstr "sidrište" +msgstr "Sidrište" #: kcm_hotkeys/hotkeys_context_menu.cpp:43 #: kcm_hotkeys/hotkeys_context_menu.cpp:55 @@ -501,19 +499,19 @@ #: kcm_hotkeys/hotkeys_export_widget.ui:44 msgctxt "Don't change the state of exported hotkey actions." msgid "Actual State" -msgstr "prema tekućem stanju" +msgstr "Prema tekućem stanju" #. i18n: ectx: property (text), item, widget (QComboBox, state) #: kcm_hotkeys/hotkeys_export_widget.ui:49 msgctxt "Export hotkey actions in enabled state." msgid "Enabled" -msgstr "uključen" +msgstr "Uključen" #. i18n: ectx: property (text), item, widget (QComboBox, state) #: kcm_hotkeys/hotkeys_export_widget.ui:54 msgctxt "Export hotkey actions into disabled state" msgid "Disabled" -msgstr "isključeno" +msgstr "Isključeno" #. i18n: ectx: property (statusTip), widget (QLabel, idLabel) #: kcm_hotkeys/hotkeys_export_widget.ui:62 @@ -572,18 +570,18 @@ #: kcm_hotkeys/hotkeys_model.cpp:402 msgctxt "action name" msgid "Name" -msgstr "ime" +msgstr "Ime" # >> @title:column #: kcm_hotkeys/hotkeys_model.cpp:406 msgctxt "action enabled" msgid "Enabled" -msgstr "uključena" +msgstr "Uključena" # >> @title:column #: kcm_hotkeys/hotkeys_model.cpp:409 msgid "Type" -msgstr "tip" +msgstr "Tip" #: kcm_hotkeys/kcm_hotkeys.cpp:96 msgid "KDE Hotkeys Configuration Module" @@ -599,7 +597,7 @@ #: kcm_hotkeys/kcm_hotkeys.cpp:104 msgid "Maintainer" -msgstr "održavalac" +msgstr "Održavalac" #: kcm_hotkeys/kcm_hotkeys.cpp:332 msgid "" @@ -649,25 +647,25 @@ #. i18n: ectx: property (text), widget (QRadioButton, window_appears) #: kcm_hotkeys/triggers/window_trigger_widget.ui:22 msgid "Window appears" -msgstr "prozor se pojavi" +msgstr "Prozor se pojavi" # >> @option:check Trigger When #. i18n: ectx: property (text), widget (QRadioButton, window_disappears) #: kcm_hotkeys/triggers/window_trigger_widget.ui:29 msgid "Window disappears" -msgstr "prozor nestane" +msgstr "Prozor nestane" # >> @option:check Trigger When #. i18n: ectx: property (text), widget (QRadioButton, window_gets_focus) #: kcm_hotkeys/triggers/window_trigger_widget.ui:36 msgid "Window gets focus" -msgstr "prozor dobije fokus" +msgstr "Prozor dobije fokus" # >> @option:check Trigger When #. i18n: ectx: property (text), widget (QRadioButton, window_lost_focus) #: kcm_hotkeys/triggers/window_trigger_widget.ui:43 msgid "Window loses focus" -msgstr "prozor izgubi fokus" +msgstr "Prozor izgubi fokus" #: libkhotkeysprivate/actions/activate_window_action.cpp:87 msgid "Activate window: " @@ -711,7 +709,7 @@ #: libkhotkeysprivate/conditions/and_condition.cpp:61 msgctxt "And_condition" msgid "And" -msgstr "i" +msgstr "I" #: libkhotkeysprivate/conditions/existing_window_condition.cpp:72 msgid "Existing window: " @@ -720,12 +718,12 @@ #: libkhotkeysprivate/conditions/not_condition.cpp:63 msgctxt "Not_condition" msgid "Not" -msgstr "ne" +msgstr "Ne" #: libkhotkeysprivate/conditions/or_condition.cpp:69 msgctxt "Or_condition" msgid "Or" -msgstr "ili" +msgstr "Ili" #: libkhotkeysprivate/khotkeysglobal.h:40 msgid "Menu Editor entries" diff -Nru khotkeys-5.2.1/po/uk/khotkeys.po khotkeys-5.2.2/po/uk/khotkeys.po --- khotkeys-5.2.1/po/uk/khotkeys.po 2015-02-21 19:39:11.000000000 +0000 +++ khotkeys-5.2.2/po/uk/khotkeys.po 2015-03-19 15:01:50.000000000 +0000 @@ -1,7 +1,7 @@ # Translation of khotkeys.po to Ukrainian -# translation of khotkeys.po to Ukrainian -# Ukrainian translation of khotkeys.po -# Copyright (C) 2000,2002, 2003, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 This_file_is_part_of_KDE +# This file is distributed under the license LGPL version 2.1 or +# version 3 or later versions approved by the membership of KDE e.V. # # Andriy Rysin , 2002, 2003, 2006. # Eugene Onischenko , 2004, 2005.