diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-04 18:21:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-04 18:21:32 -0600 |
| commit | d9e53385f295f699b9f95ceda1ee40b7c8a80bdf (patch) | |
| tree | d4054a31cec8f2b91dd36210764c3a3ab685727f /konqueror | |
| parent | 7c88a397842df20bee5960d7ff1eacf80a80e088 (diff) | |
| parent | a3b5ac40733523142094f6341d21945094790f51 (diff) | |
| download | tdebase-d9e53385f295f699b9f95ceda1ee40b7c8a80bdf.tar.gz tdebase-d9e53385f295f699b9f95ceda1ee40b7c8a80bdf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'konqueror')
| -rw-r--r-- | konqueror/client/kfmclient.cc | 2 | ||||
| -rwxr-xr-x | konqueror/convert_kdelnk.sh | 4 | ||||
| -rw-r--r-- | konqueror/profile_kde_devel.desktop | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index dcb508dc8..f8533ef17 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -96,7 +96,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) puts(i18n(" kfmclient openProfile 'profile' ['url']\n" " # Opens a window using the given profile.\n" - " # 'profile' is a file under ~/.kde/share/apps/konqueror/profiles.\n" + " # 'profile' is a file under ~/.trinity/share/apps/konqueror/profiles.\n" " # 'url' is an optional URL to open.\n\n").local8Bit()); puts(i18n(" kfmclient openProperties 'url'\n" diff --git a/konqueror/convert_kdelnk.sh b/konqueror/convert_kdelnk.sh index 02ed247e6..0acc799ad 100755 --- a/konqueror/convert_kdelnk.sh +++ b/konqueror/convert_kdelnk.sh @@ -3,7 +3,7 @@ # Converts all user's .kdelnk files to .desktop # Necessary to avoid duplication when saving a mimetype or an applnk -find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print | +find ~/.trinity/share/mimelnk ~/.trinity/share/applnk -name "*.kdelnk" -print | while read k; do d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'` echo "Renaming $k to $d" @@ -11,7 +11,7 @@ find ~/.kde/share/mimelnk ~/.kde/share/applnk -name "*.kdelnk" -print | done # Convert user's bookmarks to .desktop and to remove .xpm from icons -find ~/.kde/share/apps/kfm/bookmarks -type f -print | +find ~/.trinity/share/apps/kfm/bookmarks -type f -print | while read k; do if echo $k | grep -q kdelnk; then # kdelnk file d=`echo $k|sed -e 's/\.kdelnk/\.desktop/'` diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop index 2f87dcb4b..afb7d36e8 100644 --- a/konqueror/profile_kde_devel.desktop +++ b/konqueror/profile_kde_devel.desktop @@ -79,21 +79,21 @@ ViewT0_PassiveMode=false ViewT0_ServiceName=khtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false -ViewT0_URL=http://api.kde.org/ +ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false ViewT1_ServiceName=khtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false -ViewT1_URL=http://doc.trolltech.com/ +ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/index-2.html ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false ViewT2_ServiceName=khtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false -ViewT2_URL=http://bugs.kde.org/ +ViewT2_URL=http://bugs.trinitydesktop.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false |