diff options
| author | Luca Beltrame <[email protected]> | 2014-07-16 10:13:57 +0200 |
|---|---|---|
| committer | Luca Beltrame <[email protected]> | 2014-07-16 10:13:57 +0200 |
| commit | e242d9548d11d92568a648efece5ff6c280b36cd (patch) | |
| tree | 414cc5b1eb313abf6b52ce978ee61e1f649167c3 /src/settings | |
| parent | fc4315d57e8fe64d05aad2a1c24800f0149b21da (diff) | |
| parent | abd114f710b9d1247ecea4a82fb338492e9caf78 (diff) | |
Merge branch 'master' into frameworks
Conflicts:
kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch]
plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.desktop | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.desktop | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinservices.desktop | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.desktop | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop index 9da5ee462..163afe6a0 100644 --- a/src/settings/kcm/kcmdolphingeneral.desktop +++ b/src/settings/kcm/kcmdolphingeneral.desktop @@ -305,6 +305,7 @@ X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager X-KDE-Keywords[el]=διαχειριστής αρχείων +X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop index 6e59ae4dd..8378ee6d3 100644 --- a/src/settings/kcm/kcmdolphinnavigation.desktop +++ b/src/settings/kcm/kcmdolphinnavigation.desktop @@ -305,6 +305,7 @@ X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager X-KDE-Keywords[el]=διαχειριστής αρχείων +X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop index 42c34947f..33443343d 100644 --- a/src/settings/kcm/kcmdolphinservices.desktop +++ b/src/settings/kcm/kcmdolphinservices.desktop @@ -254,6 +254,7 @@ X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager X-KDE-Keywords[el]=διαχειριστής αρχείων +X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 51f15e77a..abb689832 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -303,6 +303,7 @@ X-KDE-Keywords[cs]=správce souborů X-KDE-Keywords[da]=filhåndtering X-KDE-Keywords[de]=Dateimanager X-KDE-Keywords[el]=διαχειριστής αρχείων +X-KDE-Keywords[en_GB]=file manager X-KDE-Keywords[es]=gestor de archivos X-KDE-Keywords[et]=failihaldur X-KDE-Keywords[fi]=tiedostonhallinta |