X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=README.localization;h=2f1b3512dff75837f3fc8cf44d431b15a98c8db9;hb=df19a709008e706c40c3b81e6a42f61bbef745ef;hp=6b0b540b5eb0ebc309dc9d7ee51b75da3c9f96f9;hpb=58811966b13ca169ebfbfcd8f82a2e87b75d26a6;p=lyx.git

diff --git a/README.localization b/README.localization
index 6b0b540b5e..2f1b3512df 100644
--- a/README.localization
+++ b/README.localization
@@ -1,6 +1,6 @@
 
 	Localization/Translation FAQ
-                (2007-2015)
+                (2007-2018)
 
     by Ran Rutenberg, Pavel Sanda, Michael Gerz
 
@@ -18,7 +18,7 @@ and dialog items, console messages) into their native language.
 The file you need to edit is an xx.po file where xx stands for your language's
 two letter code. For a list of language codes look at:
 
-  http://www.gnu.org/software/gettext/manual/html_mono/gettext.html#Language-Codes
+  https://www.gnu.org/software/gettext/manual/html_mono/gettext.html#Language-Codes
 
 If you want to start from scratch then you should obtain a copy of the lyx.pot
 and name it after your language. German would be for example de.po and Polish
@@ -29,7 +29,7 @@ There are basically two source trees you can start to work with - trunk
 (development version) and branch (stable version). Unless the development
 version is shortly before release it is better to start your translating
 work on the stable version. If you have no idea how to get those trees you
-can follow http://www.lyx.org/HowToUseGIT page.
+can follow https://www.lyx.org/HowToUseGIT page.
 
 
 2) HOW DO I EDIT PO FILES?
@@ -64,6 +64,16 @@ These chars should be somehow used in your translations, however you'll have to
 invent your own working shortcuts for dialog and menu entries and resolve
 possible conflicts of the same shortcut chars in one menu...
 
+You will be informed about conflicts in the terminal if you try to access the
+menu.
+
+Note that, in the case of '|', if more than one character follows, this means
+that LyX will try each of them in turn and use the first one that is not yet
+used by another entry in the menu. That way, you can define alternative shortcuts
+in the case one works in one context only, and another one only in another. You
+can use this possibility also in translations, but please use it only if no
+single shortcut that fits could be found.
+
 Note also that there are already used global shortcuts (such as p k x c m s a)
 and you should avoid using these characters for first-level menu shortcuts.
 
@@ -129,7 +139,7 @@ For advanced users - if you want to remerge your files against current source:
 
 Send your edited xx.po file to po-updates@lyx.org.
 
-Also you can check http://www.lyx.org/trac/browser/lyxgit/?rev=master to track
+Also you can check https://www.lyx.org/trac/browser/lyxgit/?rev=master to track
 changes or watch updates.
 
 
@@ -144,12 +154,12 @@ new strings appear, no other function.
 
 For a basic idea of how the translation works, you can look at
 
-  http://en.wikipedia.org/wiki/Gettext
+  https://en.wikipedia.org/wiki/Gettext
 
 For detailed reference (including a full list of country and language codes),
 have a look at
 
-  http://www.gnu.org/software/gettext/manual/gettext.html
+  https://www.gnu.org/software/gettext/manual/gettext.html
 
 
 Consider subscribing to the documentation list, lyx-docs@lists.lyx.org (rather
@@ -177,11 +187,27 @@ instructions.
 
 The problematic strings can be then fixed in the .po file. For inspiration the
 typical places in .po files, where to fix the translation, can be seen on the
-following commit: http://www.lyx.org/trac/changeset/38169.
+following commit: https://www.lyx.org/trac/changeset/38169.
 
 If you need to manually regenerate the layouttranslations file from .po files
-run `make ../lib/layouttranslations' in the po directory. The Python polib
-library is needed for building the output file.
+- Under Linux: If using autotools, execute the command
+ `make ../lib/layouttranslations'
+ in the po directory. If using CMake, execute the command
+ `make layouttranslations1'
+ in the build directory.
+ The Python polib library is needed for building the output file.
+- Under Windows:
+ 1. install the Python extensions "polib". To do this,
+ 1.1 open a commen line prompt in the folder where you find the file "pip.exe"
+     withing the python installation folder.
+ 1.2 execute the command
+     pip install polib
+ 2. close the command prompt and open the file "lyx.sln" with MSVC. You find
+    file in the compilation result folder you set for LyX
+ 3. right click in MSVC on the target "layouttranslations1" and choose "Rebuild"
+
+Optionally - to quickly check whether some new translatable strings appeared
+for your language you can always check ../lib/layouttranslations.review.
 
 Q: Running make ../lib/layouttranslations returns with just saying
    ../lib/layouttranslations is up to date.