cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / po / README.Translations

diff --git a/po/README.Translations b/po/README.Translations
index 067320b..afb5e2e 100644 (file)
--- a/po/README.Translations
+++ b/po/README.Translations
@@ -1,5 +1,5 @@
-In order to create or update a translatable file, run the following command
-in the directory i18n/:
+In order to create or update a translatable file, run the following
+command in the directory po/:
 
 ./update.sh xx
 
@@ -8,23 +8,48 @@ if needed, may be suffixed by a country code according to ISO 3166).
 Quassel will automatically load these translation files based on the
 system locale. Examples for valid codes: de, en_US
 
-You can open translation files with poedit for example and add/edit translated strings.
+You can open translation files with poedit for example and add/edit
+translated strings.
 
-The *.po files can and should be kept in sync with the source code by running
-update.sh regularly (existing translations won't be removed).
+The *.po files can and should be kept in sync with the source code by
+running update.sh regularly (existing translations won't be removed).
 
-NOTE: Remember to remove X-Virgin-Header line if you want to preserve your header.
+NOTE: Remember to remove X-Virgin-Header line if you want to preserve
+your header.
+
+Qt itself does not use the *.po files, but a compact binary format
+(*.qm). These files will automatically be generated at build time. By
+default, all languages will be built. To select languages, use
+environment variable LINGUAS to specify superset of languages you want
+to build in. As you can see in example there we will build only Czech
+German and French translations.
 
-Qt itself does not use the *.po files, but a compact binary format (*.qm). 
-These files will automatically be generated at build time. By default, all
-languages will be built. To select languages, use environment variable LINGUAS
-to specify superset of languages you want to build in. As you can see in
-example there we will build only Czech German and French translations.
 EXAMPLE:
 $ export LINGUAS="cs de fr"
 $ cmake /path/to/source
 
-NOTE: You'll need lconvert installed with your Qt in order to generate
-      translation files. Some distributions don't package that tool;
-      in that case you won't get translations.
-
+NOTE: You'll need lupdate, lconvert, lrelease installed with your Qt in
+      order to generate translation files. Some distributions don't
+      package that tool; in that case you won't get translations.
+
+The .pot file is regenerated using `./update-pot.sh` and can be pushed
+to Transifex via `tx push -s`.
+Note that as of Feb 2016 this is done automatically by nightly runs of
+scripts/tx-sync.sh which pushes an updated quassel.pot to a location
+that is fetched by Transifex on regular intervals. This location is
+currently configured as
+<https://github.com/quassel/quassel-i18n/raw/tx-sync/po/quassel.pot> and
+can be updated at https://www.transifex.com/quassel/quassel/content/ →
+"Auto update resources".
+
+== For maintainers ==
+To synchronize the i18n repository with the main repository follow these steps:
+
+$ git remote add origin-i18n git@github.com:quassel/quassel-i18n.git
+$ git fetch origin-i18n
+$ git merge --squash origin-i18n/tx-sync
+$ pushd po && ./update-pot.sh; popd
+$ git add po/quassel.pot
+$ git commit
+$ git push
+$ git push origin-i18n +HEAD:tx-sync