From d42076f18783a48fffbaea48720ff6257251ba28 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 4 Nov 2012 01:20:52 -0600 Subject: [PATCH] Fix references to user profile directory. (cherry picked from commit cd3ecd88c60f91ea4b7034d24ec5b3dbcda25eb8) --- doc/kaddressbook/index.docbook | 2 +- doc/kmail/faq.docbook | 6 +++--- doc/kpilot/configuration.docbook | 6 +++--- doc/kpilot/sync.docbook | 4 ++-- karm/taskview.cpp | 4 ++-- kmailcvt/filter_kmail_maildir.cxx | 2 +- konsolekalendar/examples/tcm2kcal.pl | 4 ++-- libkholidays/holidays/holiday_nl | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/kaddressbook/index.docbook b/doc/kaddressbook/index.docbook index 9473fc52..d7727949 100644 --- a/doc/kaddressbook/index.docbook +++ b/doc/kaddressbook/index.docbook @@ -111,7 +111,7 @@ will be displayed: &kaddressbook; can use multiple resources for loading and storing its contacts. After starting &kaddressbook; for the first time you will have a default resource installed that saves all contacts in a vCard file -under $HOME/.kde/share/apps/kabc/std.vcf; you can add more resources +under $HOME/.trinity/share/apps/kabc/std.vcf; you can add more resources by using the Resource Configuration dialog, which is available in kcontrol under KDE Components->KDE Resources Configuration: diff --git a/doc/kmail/faq.docbook b/doc/kmail/faq.docbook index f7ef1e68..28e24c9f 100644 --- a/doc/kmail/faq.docbook +++ b/doc/kmail/faq.docbook @@ -104,7 +104,7 @@ ultimate ownertrust: it is no longer implicitly done for you. mail? Most &kmail; settings are stored in $KDEHOME/share/config/kmailrc, where $KDEHOME is typically ~/.kde; the identities are stored in +class="directory">~/.trinity; the identities are stored in $KDEHOME/share/config/emailidentities and your mail is saved in $KDEHOME/share/apps/kmail (or @@ -234,12 +234,12 @@ select Help&kmail; Introduction Can I configure the location of my mail folder? -Exit &kmail;, make a backup of ~/.kde/share/config/kmailrc, +Exit &kmail;, make a backup of ~/.trinity/share/config/kmailrc, then open it with an editor and add ⪚ folders=/home/username/.mail to the [General] section. Then move all your existing folders (including the hidden index files) to the new location. The next time you start &kmail; will use /home/username/.mail instead of -/home/username/.kde/share/apps/kmail. Note that &kmail; +/home/username/.trinity/share/apps/kmail. Note that &kmail; will lose its filters if you change the mail folder's location but forget to move your existing folders. diff --git a/doc/kpilot/configuration.docbook b/doc/kpilot/configuration.docbook index d6da8f14..1d1a0024 100644 --- a/doc/kpilot/configuration.docbook +++ b/doc/kpilot/configuration.docbook @@ -299,7 +299,7 @@ stores the information from the &PalmPilot;. This folder is created in the $KDEHOME/share/apps/kpilot/DBBackup/ folder, where the $KDEHOME environment variable -(typically /home/Login Name/.kde/) +(typically /home/Login Name/.trinity/) points to the folder that contains your configuration and data for the &kde; applications. @@ -1052,7 +1052,7 @@ need the filename of the calendar file (this will usually be a file that ends in standard &korganizer; iCalendar file, it will be under the $KDEHOME/share/apps/korganizer/ folder, where the $KDEHOME environment variable (typically -/home/user/.kde/) points to the folder +/home/user/.trinity/) points to the folder that contains your configuration and data for the &kde; applications. @@ -1404,7 +1404,7 @@ role="extension">.vcf) to sync with, of if it uses the standard &kde; address book file, it will be under the $KDEHOME/share/apps/kabc/ folder, where the $KDEHOME environment -variable (typically /home/Login Name/.kde/) +variable (typically /home/Login Name/.trinity/) points to the folder that contains your configuration and data for the &kde; applications. diff --git a/doc/kpilot/sync.docbook b/doc/kpilot/sync.docbook index 5fba145c..a9b707b1 100644 --- a/doc/kpilot/sync.docbook +++ b/doc/kpilot/sync.docbook @@ -136,7 +136,7 @@ On every backup, &kpilot; stores a copy of all your &handheld; data under the $KDEHOME/share/apps/kpilot/DBBackup/User Name/ folder, allowing you to restore that copy later, if needed. The $KDEHOME environment variable -(typically /home/Login Name/.kde/) +(typically /home/Login Name/.trinity/) points to the folder that contains your configuration and data for the &kde; applications. @@ -174,7 +174,7 @@ data entered on the &handheld; since the last backup. The data saved on the last backup is located on the $KDEHOME/share/apps/kpilot/DBBackup/User Name/ folder. The $KDEHOME environment variable -(typically /home/Login Name/.kde/) +(typically /home/Login Name/.trinity/) points to the folder that contains your configuration and data for the &kde; applications. diff --git a/karm/taskview.cpp b/karm/taskview.cpp index 929541ac..3852fda9 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -402,7 +402,7 @@ void TaskView::startTimerFor(Task* task, TQDateTime startTime ) } } } - else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.kde/share/apps/kabc/lock.")); + else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/kabc/lock.")); } void TaskView::clearActiveTasks() @@ -518,7 +518,7 @@ void TaskView::newTask(TQString caption, Task *parent) if ( uid.isNull() ) { KMessageBox::error( 0, i18n( - "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.kde/share/apps/kabc/lock/ " ) ); + "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/kabc/lock/ " ) ); } delete dialog; diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index 2a196156..91b30a35 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/kmailcvt/filter_kmail_maildir.cxx @@ -28,7 +28,7 @@ FilterKMail_maildir::FilterKMail_maildir( void ) : i18n( "

KMail import filter

" "

Select the base directory of the KMail mailfolder you want to import.

" "

Note: Never select your current local KMail maildir (usually " - "~/Mail or ~/.kde/share/apps/kmail/mail ): in this case, KMailCVT may become stuck " + "~/Mail or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck " "in a continuous loop.

" "

This filter does not import KMail mailfolders with mbox files.

" "

Since it is possible to recreate the folder structure, the folders " diff --git a/konsolekalendar/examples/tcm2kcal.pl b/konsolekalendar/examples/tcm2kcal.pl index 1fb3be31..15949a79 100755 --- a/konsolekalendar/examples/tcm2kcal.pl +++ b/konsolekalendar/examples/tcm2kcal.pl @@ -27,7 +27,7 @@ # -y , where year is an integer YYYY # default is current year # -f , where file is location of output KDE calendar -# default is $HOME/.kde/share/apps/korganizer/tcm.ics +# default is $HOME/.trinity/share/apps/korganizer/tcm.ics # -w where konsolekalendar is located use strict; @@ -42,7 +42,7 @@ use Date::Calc qw(Today Month_to_Text my($konkal)="/usr/bin/konsolekalendar"; #location of new TCM KDE calendar -my($cal)="$HOME/.kde/share/apps/korganizer/tcm.ics"; +my($cal)="$HOME/.trinity/share/apps/korganizer/tcm.ics"; #default program execution mode my($mode)="--add"; diff --git a/libkholidays/holidays/holiday_nl b/libkholidays/holidays/holiday_nl index 23df998e..cc1e6f6f 100644 --- a/libkholidays/holidays/holiday_nl +++ b/libkholidays/holidays/holiday_nl @@ -47,7 +47,7 @@ blue "Wintertijd" on last sunday in october : Author: Wilbert Berendsen : : Kopieer dit bestand eventueel onder een andere naam, maar beginnend -: met 'holiday_' naar ~/.kde/share/apps/korganizer/ en haal op de +: met 'holiday_' naar ~/.trinity/share/apps/korganizer/ en haal op de : volgende regels de dubbelepunten weg. :small "Eerste advent" on sunday before 3.12 :small "Tweede advent" on sunday before 10.12