anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change LYX_USER_DIR_1[234]x to LYX_USER_DIR_15x

Browse Source 
change LYX_DIR_1[234]x to LYX_DIR_15x

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16481 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2007-01-03 18:02:26 +00:00
parent cdb23fdf4f
commit 79957d0f70
32 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/doc/Customization.lyx
View File

@ -750,7 +750,7 @@ Userdir
These directories are completely independent (but read on).
Note that setting the environment variable
\family typewriter
LYX_USERDIR_13x
LYX_USERDIR_15x
\family default
to some value has exactly the same effect
\family typewriter

2
lib/doc/de_Customization.lyx
View File

@ -1004,7 +1004,7 @@ Indem Sie LyX mit der Option
Anstelle der Kommandozeilenoption können Sie übrigens auch die Umgebungsvariabl
e
\family typewriter
LYX_USERDIR_12x
LYX_USERDIR_15x
\family default
auf das zu verwendende Verzeichnis setzen.
\end_layout

2
lib/doc/eu_Customization.lyx
View File

@ -722,7 +722,7 @@ Erabdir
dira).
Ohartu zaitez
\family typewriter
LYX_USERDIR_13x
LYX_USERDIR_15x
\family default
inguruneko aldagaia balio hauetariko batekin ezartzeak antzeko eragina
duela.

2
lib/doc/fr_Customization.lyx
View File

@ -785,7 +785,7 @@ R
Ces répertoires sont complètement indépendants (mais lisez la suite).
Notez que la variable d'environnement
\family typewriter
LYX_USERDIR_13x
LYX_USERDIR_15x
\family default
a exactement le même rôle.
\end_layout

8
lyx.man
View File

@ -125,7 +125,7 @@ specifies the application name under which resources are to be
obtained, rather than the default executable file name.
.SH ENVIRONMENT
.TP
.B LYX_DIR_14x
.B LYX_DIR_15x
can be used to specify which system directory to use.
.PP
The system directory is determined by searching for the file
@ -133,7 +133,7 @@ The system directory is determined by searching for the file
.br
1) \-sysdir command line parameter
.br
2) LYX_DIR_14x environment variable
2) LYX_DIR_15x environment variable
.br
3) Maybe <path of binary>/TOP_SRCDIR/lib
.br
@ -141,14 +141,14 @@ The system directory is determined by searching for the file
.br
5) hardcoded lyx_dir (usually /usr/local/share/lyx on UNIX)
.TP
.B LYX_USERDIR_14x
.B LYX_USERDIR_15x
can be used to specify which user directory to use.
.PP
The user directory is, in order of precedence:
.br
1) \-userdir command line parameter
.br
2) LYX_USERDIR_14x environment variable
2) LYX_USERDIR_15x environment variable
.br
3) $HOME/.<name of binary> if no explicit setting is made

2
po/bg.po
View File

@ -16397,7 +16397,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/ca.po
View File

@ -14082,7 +14082,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

4
po/cs.po
View File

@ -12434,12 +12434,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Nepodaøilo se zjitit systémový adresáø, pøi prohledávání\n"
"\t%1$s\n"
"Pou¾ijte parametr pøíkazové øádky '-sysdir' nebo nastavte promìnnou "
"prostøedí LYX_DIR_14x do systémového adresáøe LyX-u obsahujícího soubor "
"prostøedí LYX_DIR_15x do systémového adresáøe LyX-u obsahujícího soubor "
"`chkconfig.ltx'."
#: src/support/package.C.in:651

2
po/da.po
View File

@ -13121,7 +13121,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

4
po/de.po
View File

@ -12588,12 +12588,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Das Systemverzeichnis kann trotz der Suche in\n"
"\t%1$s\n"
"nicht bestimmt werden. Verwenden Sie den Befehlszeilenparameter '-sysdir' "
"oder setzen Sie die Umgebungsvariable LYX_DIR_14x auf das LyX-"
"oder setzen Sie die Umgebungsvariable LYX_DIR_15x auf das LyX-"
"Systemverzeichnis, das die Datei 'chkconfig.ltx' enthält."
#: src/support/package.C.in:651

4
po/es.po
View File

@ -12547,12 +12547,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"No se pudo determinar el directorio del sistema habiendo buscado en\n"
"\t%1$s\n"
"Use el parámetro '-sysdir' de la línea de comandos o ponga en la variable de "
"entorno LYX_DIR_14x al directorio del sistema que contiene el archivo "
"entorno LYX_DIR_15x al directorio del sistema que contiene el archivo "
"`chkconfig.ltx'."
#: src/support/package.C.in:651

4
po/eu.po
View File

@ -12525,12 +12525,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Ezin izan da egin den bilaketako sistemako direktorioa zehaztu\n"
"\t%1$s\n"
"Erabili '-sysdir' komando lerroko parametroarekin edo ezarri inguruneko "
"LYX_DIR_14x aldagaia LyX sistemako direktorioarekin ('chkconfig.ltx' "
"LYX_DIR_15x aldagaia LyX sistemako direktorioarekin ('chkconfig.ltx' "
"fitxategia duena)."
#: src/support/package.C.in:651

4
po/fi.po
View File

@ -13350,12 +13350,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Järjestelmähakemiston sijainnin määritys ei onnistunut, vaikka\n"
"käytiin läpi hakemistot\n"
"\t%1%\n"
"Käytä \"--sysdir\"-valitsinta tai aseta ympäristömuuttuja LYX_DIR_13x "
"Käytä \"--sysdir\"-valitsinta tai aseta ympäristömuuttuja LYX_DIR_15x "
"osoittamaan LyXin järjestelmähakemistoon, jossa on tiedosto \"chkconfig.ltx"
"\"."

4
po/fr.po
View File

@ -12822,12 +12822,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"N'a pas pu déterminer le répertoire système, après avoir cherché\n"
"\t%1$s\n"
"Utilisez l'option de ligne de commande '-sysdir' ou réglez la variable "
"d'environnement LYX_DIR_14x sur le répertoire système LyX qui contient le "
"d'environnement LYX_DIR_15x sur le répertoire système LyX qui contient le "
"fichier 'chkconfig.ltx'."
#: src/support/package.C.in:651

4
po/gl.po
View File

@ -12633,12 +12633,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Non foi posíbel determinar a directória do sistema tendo procurado en\n"
"\t%1$s\n"
"Use o parámetro '-sysdir' da liña de comandos ou faga que a variábel de "
"entorno LYX_DIR_14x aponte a directória do sistema que contén o ficheiro "
"entorno LYX_DIR_15x aponte a directória do sistema que contén o ficheiro "
"`chkconfig.ltx'."
#: src/support/package.C.in:651

2
po/he.po
View File

@ -13696,7 +13696,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

4
po/hu.po
View File

@ -12441,11 +12441,11 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Nem tudom meghatározni a rendszerkönyvtárat, kerestem a \t%1$s-ban\n"
"Próbálja a '-sysdir' parancssori paramétert vagy készítsen egy környezeti "
"változót LYX_DIR_14x néven a LyX rendszerkönyvtárhoz, ahol a `chkconfig."
"változót LYX_DIR_15x néven a LyX rendszerkönyvtárhoz, ahol a `chkconfig."
"ltx' fájl van."
#: src/support/package.C.in:651

4
po/it.po
View File

@ -12661,12 +12661,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Non riesco a determinate la cartella di sistema avendo cercato\n"
"\t%1$s\n"
"Usa il parametro di linea di comando '-sysdir' o imposta la variabile "
"d'ambienteLYX_DIR_14x alla cartella di sistema di LyX contenete il file "
"d'ambienteLYX_DIR_15x alla cartella di sistema di LyX contenete il file "
"`chkconfig.ltx'."
#: src/support/package.C.in:651

2
po/nb.po
View File

@ -12542,7 +12542,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/nl.po
View File

@ -13566,7 +13566,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr "zet de omgevingsvariablele LYX_DIR_11x gelijk aan de LyX systeemmap"
#: src/support/package.C.in:651

4
po/nn.po
View File

@ -12469,12 +12469,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Klarte ikkje å finne systemstigen etter å ha leita i\n"
"\t%1$s\n"
"Prøv '-sysdir' valet til LyX frå kommandolina eller set miljøvalet "
"LYX_DIR_14x til systemstigen i fila `chkconfig.ltx'."
"LYX_DIR_15x til systemstigen i fila `chkconfig.ltx'."
#: src/support/package.C.in:651
#, c-format

4
po/pl.po
View File

@ -12598,12 +12598,12 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
"Nie mo¿na okre¶liæ katalogu systemowego zawieraj±cy poszukiwany\n"
"\t%1$s\n"
"Spróbuj podaæ parametr wywo³ania '-sysdir' lub ustaw zmienn± ¶rodowiskow± "
"LYX_DIR_14x na katalog systemowy LyX-a zawieraj±cy plik 'chkconfig.ltx'."
"LYX_DIR_15x na katalog systemowy LyX-a zawieraj±cy plik 'chkconfig.ltx'."
#: src/support/package.C.in:651
#, c-format

2
po/pt.po
View File

@ -13985,7 +13985,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/ro.po
View File

@ -12922,7 +12922,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/ru.po
View File

@ -13307,7 +13307,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/sk.po
View File

@ -13022,7 +13022,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/sl.po
View File

@ -13367,7 +13367,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr "nastavite okoljsko spremenljivko LYX_DIR_11x na sistemski imenik LyXa,"
#: src/support/package.C.in:651

2
po/sv.po
View File

@ -13929,7 +13929,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/tr.po
View File

@ -12509,7 +12509,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

2
po/wa.po
View File

@ -13921,7 +13921,7 @@ msgid ""
"Unable to determine the system directory having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or set the environment variable "
"LYX_DIR_14x to the LyX system directory containing the file `chkconfig.ltx'."
"LYX_DIR_15x to the LyX system directory containing the file `chkconfig.ltx'."
msgstr ""
#: src/support/package.C.in:651

12
src/support/package.C.in
View File

@ -471,11 +471,11 @@ get_system_support_dir(string const & abs_binary,
return path;
}
// 2. Use the "LYX_DIR_14x" environment variable.
path = extract_env_var_dir("LYX_DIR_14x");
// 2. Use the "LYX_DIR_15x" environment variable.
path = extract_env_var_dir("LYX_DIR_15x");
if (!path.empty()) {
searched_dirs.push_back(path);
if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_14x"))
if (check_env_var_dir(path, chkconfig_ltx, "LYX_DIR_15x"))
return path;
}
@ -566,7 +566,7 @@ get_system_support_dir(string const & abs_binary,
"having searched\n"
"\t%1$s\n"
"Use the '-sysdir' command line parameter or "
"set the environment variable LYX_DIR_14x to "
"set the environment variable LYX_DIR_15x to "
"the LyX system directory containing the file "
"`chkconfig.ltx'."),
lyx::from_utf8(searched_dirs_str)))
@ -593,8 +593,8 @@ get_user_support_dir(string const & default_user_support_dir,
if (!path.empty())
return std::make_pair(path, explicit_userdir);
// 2. Use the LYX_USERDIR_14x environment variable.
path = extract_env_var_dir("LYX_USERDIR_14x");
// 2. Use the LYX_USERDIR_15x environment variable.
path = extract_env_var_dir("LYX_USERDIR_15x");
if (!path.empty())
return std::make_pair(path, explicit_userdir);

2
src/support/package.h
View File

@ -91,7 +91,7 @@ public:
/** The user_support directory was set explicitly using either
* the -userdir command line switch or
* the LYX_USERDIR_14x environment variable.
* the LYX_USERDIR_15x environment variable.
*/
bool explicit_user_support() const;