diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index b9c6f60c25..3215c979c9 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -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 diff --git a/lib/doc/de_Customization.lyx b/lib/doc/de_Customization.lyx index 8018257a99..e10eb66f60 100644 --- a/lib/doc/de_Customization.lyx +++ b/lib/doc/de_Customization.lyx @@ -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 diff --git a/lib/doc/eu_Customization.lyx b/lib/doc/eu_Customization.lyx index b472d67afa..1a61d5237c 100644 --- a/lib/doc/eu_Customization.lyx +++ b/lib/doc/eu_Customization.lyx @@ -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. diff --git a/lib/doc/fr_Customization.lyx b/lib/doc/fr_Customization.lyx index fe8f0dbb14..3c693c461a 100644 --- a/lib/doc/fr_Customization.lyx +++ b/lib/doc/fr_Customization.lyx @@ -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 diff --git a/lyx.man b/lyx.man index eb94d622ba..f2be174c4b 100644 --- a/lyx.man +++ b/lyx.man @@ -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 /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/. if no explicit setting is made diff --git a/po/bg.po b/po/bg.po index 32a1ebeb70..4ac0769176 100644 --- a/po/bg.po +++ b/po/bg.po @@ -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 diff --git a/po/ca.po b/po/ca.po index e94b11c348..48809e911e 100644 --- a/po/ca.po +++ b/po/ca.po @@ -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 diff --git a/po/cs.po b/po/cs.po index b4fb8554ec..beb451a194 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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 diff --git a/po/da.po b/po/da.po index 4221e1952e..37d3ada818 100644 --- a/po/da.po +++ b/po/da.po @@ -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 diff --git a/po/de.po b/po/de.po index b78f7d37f7..023ee38f86 100644 --- a/po/de.po +++ b/po/de.po @@ -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 diff --git a/po/es.po b/po/es.po index 346068e126..fa8659cd68 100644 --- a/po/es.po +++ b/po/es.po @@ -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 diff --git a/po/eu.po b/po/eu.po index 6985315c0f..4be089bb4a 100644 --- a/po/eu.po +++ b/po/eu.po @@ -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 diff --git a/po/fi.po b/po/fi.po index 64afbe4be3..d7dfc07ef2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -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" "\"." diff --git a/po/fr.po b/po/fr.po index 99e2a84b24..8650a377a0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 diff --git a/po/gl.po b/po/gl.po index a4b5db26c8..b669f97eae 100644 --- a/po/gl.po +++ b/po/gl.po @@ -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 diff --git a/po/he.po b/po/he.po index c3cc467e43..6c144571b4 100644 --- a/po/he.po +++ b/po/he.po @@ -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 diff --git a/po/hu.po b/po/hu.po index 5079c5388e..75c5064ab8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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 diff --git a/po/it.po b/po/it.po index f76d7807e9..8f6b9f2ef9 100644 --- a/po/it.po +++ b/po/it.po @@ -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 diff --git a/po/nb.po b/po/nb.po index fcba232a7e..869db7fa56 100644 --- a/po/nb.po +++ b/po/nb.po @@ -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 diff --git a/po/nl.po b/po/nl.po index 736b9f3e31..b793105fe9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -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 diff --git a/po/nn.po b/po/nn.po index 07966f69d7..37b68a1d0a 100644 --- a/po/nn.po +++ b/po/nn.po @@ -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 diff --git a/po/pl.po b/po/pl.po index 9ca26da691..9ece9ac13b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -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 diff --git a/po/pt.po b/po/pt.po index 5cf05e9f22..cbdf581ed6 100644 --- a/po/pt.po +++ b/po/pt.po @@ -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 diff --git a/po/ro.po b/po/ro.po index 2b98e5298b..27dff02931 100644 --- a/po/ro.po +++ b/po/ro.po @@ -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 diff --git a/po/ru.po b/po/ru.po index 23f567d9d1..012b41ab67 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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 diff --git a/po/sk.po b/po/sk.po index f7c06de9da..9be773b091 100644 --- a/po/sk.po +++ b/po/sk.po @@ -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 diff --git a/po/sl.po b/po/sl.po index 2b38d784d3..1adc9c6870 100644 --- a/po/sl.po +++ b/po/sl.po @@ -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 diff --git a/po/sv.po b/po/sv.po index 13ed36db56..50d36e8df8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -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 diff --git a/po/tr.po b/po/tr.po index ca38c6ad0c..08f134d9dc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 diff --git a/po/wa.po b/po/wa.po index 5d4b8c8347..e7debe8aab 100644 --- a/po/wa.po +++ b/po/wa.po @@ -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 diff --git a/src/support/package.C.in b/src/support/package.C.in index d34a3d4b9e..6edd7abde4 100644 --- a/src/support/package.C.in +++ b/src/support/package.C.in @@ -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); diff --git a/src/support/package.h b/src/support/package.h index 69d11c6f76..c84a0f8bcb 100644 --- a/src/support/package.h +++ b/src/support/package.h @@ -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;