diff options
| author | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-10-16 20:36:49 +0200 |
| commit | 01e4f60a0931aba506b184d384a4e2f926b2233c (patch) | |
| tree | 902da94d4ed035af9da2aea537708cdc2ea14d9c /src/org.kde.dolphin.desktop | |
| parent | cd601a582d5454dfa1818bae7e50864e9bece575 (diff) | |
| parent | a75e81ca01ea61c615582e93ceed69398967831e (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
plasma/applets/folderview/folderview.cpp
Diffstat (limited to 'src/org.kde.dolphin.desktop')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index e15a65cc6..84325c87f 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -95,7 +95,7 @@ X-DocPath=dolphin/index.html Categories=Qt;KDE;System;FileTools;FileManager; GenericName=File Manager GenericName[af]=Lêerbestuurder -GenericName[ar]=مدير الملفات +GenericName[ar]=مدير ملفات GenericName[as]=নথিপত্ৰৰ পৰিচালক GenericName[ast]=Xestor de ficheros GenericName[be]=Кіраўнік файлаў |