Merge branch 'Plasma/5.0'

12 years ago · 79bedce5e7
parent 10c63d815c 5bd7f39f28
commit 79bedce5e7
5 changed files with 11 additions and 7 deletions
--- a/applets/devicenotifier/package/contents/ui/configGeneral.qml
+++ b/applets/devicenotifier/package/contents/ui/configGeneral.qml
@ -41,17 +41,17 @@ Item {
        }
        Controls.RadioButton {
            id: removableOnly
-            text: "Removable devices only"
+            text: i18n("Removable devices only")
            exclusiveGroup: deviceFilter
        }
        Controls.RadioButton {
            id: nonRemovableOnly
-            text: "Non-removable devices only"
+            text: i18n("Non-removable devices only")
            exclusiveGroup: deviceFilter
        }
        Controls.RadioButton {
            id: allDevices
-            text: "All devices"
+            text: i18n("All devices")
            exclusiveGroup: deviceFilter
        }
    }
--- a/applets/lock_logout/contents/ui/ConfigGeneral.qml
+++ b/applets/lock_logout/contents/ui/ConfigGeneral.qml
@ -47,7 +47,7 @@ Item {
        id: pageColumn
        spacing: itemSizeLabel.height / 2
        PlasmaExtras.Title {
-            text: i18n("SystemTray Settings")
+            text: i18n("Lock/Logout Settings")
        }

        Column {
--- a/applets/systemtray/package/contents/ui/ConfigEntries.qml
+++ b/applets/systemtray/package/contents/ui/ConfigEntries.qml
@ -105,9 +105,9 @@ Item {
                    }
                    model: ListModel {
                        id: cbItems
-                        ListElement { text: "Auto"; val: 1 }
-                        ListElement { text: "Shown"; val: 2 }
-                        ListElement { text: "Hidden"; val: 0 }
+                        ListElement { text: i18n("Auto"); val: 1 }
+                        ListElement { text: i18n("Shown"); val: 2 }
+                        ListElement { text: i18n("Hidden"); val: 0 }
                    }
                }
            }
--- a/kioslave/applications/CMakeLists.txt
+++ b/kioslave/applications/CMakeLists.txt
@ -1,3 +1,5 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kio_applications\") 
+
 add_library(kio_applications MODULE kio_applications.cpp)

 target_link_libraries(kio_applications KF5::KDELibs4Support KF5::KIOCore)
--- a/kioslave/remote/CMakeLists.txt
+++ b/kioslave/remote/CMakeLists.txt
@ -1,3 +1,5 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kio_remote\") 
+
 add_subdirectory( kdedmodule ) 
 add_subdirectory( tests )