From 2f420d4c5ca40d96ca73ead229717864e483b73c Mon Sep 17 00:00:00 2001 From: Florent Rougon <f.rougon@free.fr> Date: Wed, 12 Jul 2017 13:39:44 +0200 Subject: [PATCH] Translations: rename Translations/en to Translations/default This is mainly to make it clear that the "translation" in (after this commit) Translations/default, a priori corresponding to en_US, has a special status: it acts as the source describing the set of translatable strings, each with its id (an XML tag name) and numeric index (a PropertyList index, often 0 but not always). In the upcoming i18n infrastructure, the files in Translations/default will be used to: - detect all translatable strings (~ string extraction); - detect obsolete translated strings (those in XLIFF files but not in Translations/default anymore); This will allow a script to update the XLIFF files containing real translations, i.e., update the source strings and possibly remove obsolete entries. So, the files in Translations/default have a special "master" status in this process, and are technically quite different from those in Translations/de, Translations/es, Translations/fr, etc. The latter XML files (those not in Translations/default) will be replaced with their XLIFF equivalent, by the way (conversion script already working). See discussion at <https://sourceforge.net/p/flightgear/mailman/message/35910579/>. --- Translations/{en => default}/atc.xml | 0 Translations/{en => default}/menu.xml | 0 Translations/{en => default}/options.xml | 0 Translations/{en => default}/sys.xml | 0 Translations/{en => default}/tips.xml | 0 Translations/locale.xml | 28 ++++++++++++------------ 6 files changed, 14 insertions(+), 14 deletions(-) rename Translations/{en => default}/atc.xml (100%) rename Translations/{en => default}/menu.xml (100%) rename Translations/{en => default}/options.xml (100%) rename Translations/{en => default}/sys.xml (100%) rename Translations/{en => default}/tips.xml (100%) diff --git a/Translations/en/atc.xml b/Translations/default/atc.xml similarity index 100% rename from Translations/en/atc.xml rename to Translations/default/atc.xml diff --git a/Translations/en/menu.xml b/Translations/default/menu.xml similarity index 100% rename from Translations/en/menu.xml rename to Translations/default/menu.xml diff --git a/Translations/en/options.xml b/Translations/default/options.xml similarity index 100% rename from Translations/en/options.xml rename to Translations/default/options.xml diff --git a/Translations/en/sys.xml b/Translations/default/sys.xml similarity index 100% rename from Translations/en/sys.xml rename to Translations/default/sys.xml diff --git a/Translations/en/tips.xml b/Translations/default/tips.xml similarity index 100% rename from Translations/en/tips.xml rename to Translations/default/tips.xml diff --git a/Translations/locale.xml b/Translations/locale.xml index 524b19b21..80b8921e7 100644 --- a/Translations/locale.xml +++ b/Translations/locale.xml @@ -13,11 +13,11 @@ <lang type="string">default</lang> <strings> - <options>Translations/en/options.xml</options> - <menu>Translations/en/menu.xml</menu> - <sys>Translations/en/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> - <tips>Translations/en/tips.xml</tips> + <options>Translations/default/options.xml</options> + <menu>Translations/default/menu.xml</menu> + <sys>Translations/default/sys.xml</sys> + <atc>Translations/default/atc.xml</atc> + <tips>Translations/default/tips.xml</tips> </strings> </locale> @@ -31,7 +31,7 @@ <options>Translations/es/options.xml</options> <menu>Translations/es/menu.xml</menu> <sys>Translations/es/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> <tips>Translations/es/tips.xml</tips> </strings> </locale> @@ -46,7 +46,7 @@ <options>Translations/de/options.xml</options> <menu>Translations/de/menu.xml</menu> <sys>Translations/de/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> </strings> </locale> @@ -61,7 +61,7 @@ <options>Translations/fr/options.xml</options> <menu>Translations/fr/menu.xml</menu> <sys>Translations/fr/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> <tips>Translations/fr/tips.xml</tips> </strings> </locale> @@ -76,7 +76,7 @@ <options>Translations/it/options.xml</options> <menu>Translations/it/menu.xml</menu> <sys>Translations/it/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> <tips>Translations/it/tips.xml</tips> </strings> </locale> @@ -90,7 +90,7 @@ <options>Translations/nl/options.xml</options> <menu>Translations/nl/menu.xml</menu> <sys>Translations/nl/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> </strings> </locale> @@ -102,7 +102,7 @@ <options>Translations/pl/options.xml</options> <menu>Translations/pl/menu.xml</menu> <sys>Translations/pl/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> </strings> </locale> @@ -139,7 +139,7 @@ <options>Translations/cs/options.xml</options> <menu>Translations/cs/menu.xml</menu> <sys>Translations/cs/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> </strings> </locale> @@ -150,7 +150,7 @@ <options>Translations/da/options.xml</options> <menu>Translations/da/menu.xml</menu> <sys>Translations/da/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> </strings> </locale> @@ -190,7 +190,7 @@ <options>Translations/pt/options.xml</options> <menu>Translations/pt/menu.xml</menu> <sys>Translations/pt/sys.xml</sys> - <atc>Translations/en/atc.xml</atc> + <atc>Translations/default/atc.xml</atc> </strings> </locale> <!--