Skip to content

Commit

Permalink
Fixes #25538 - Remove fuzzy translations for 'en' locale
Browse files Browse the repository at this point in the history
Ruby code uses .mo files for the translations, but JS code uses a
generated JSON file containing the translation dictionary.
When generating the .mo file, fuzzy translations are ignored, but
when generating the json dictionary they are not.

Because en is the source locale, pulling translations from transifex
does not pull the English translation and thus the fuzzy translations
remain and are not removed when updating the translations.

This commit only removes the fuzzy translations, so on the next
translation update the json files will be generated correctly without
the wrong translations.
  • Loading branch information
tbrisker authored and xprazak2 committed Jan 2, 2019
1 parent 77b316f commit 3f2702c
Showing 1 changed file with 32 additions and 64 deletions.
96 changes: 32 additions & 64 deletions locale/en/foreman.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2017-01-12 08:26+0000\n"
"Last-Translator: Lukas Zapletal <[email protected]>\n"
"Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
"Language-Team: English (http://www.transifex.com/foreman/foreman/language/en/)\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -724,9 +724,8 @@ msgstr ""
msgid "Architecture Distribution"
msgstr ""

#, fuzzy
msgid "Architecture ID"
msgstr "Name"
msgstr ""

msgid "Architectures"
msgstr ""
Expand Down Expand Up @@ -1156,9 +1155,8 @@ msgstr ""
msgid "Browse host facts"
msgstr ""

#, fuzzy
msgid "Browser locale"
msgstr "Email address"
msgstr ""

msgid "Browser timezone"
msgstr ""
Expand Down Expand Up @@ -1307,9 +1305,8 @@ msgstr ""
msgid "Change the password"
msgstr ""

#, fuzzy
msgid "Changed environments"
msgstr "Environment"
msgstr ""

msgid "Changes to %s will propagate to all inheriting filters"
msgstr ""
Expand Down Expand Up @@ -2075,16 +2072,14 @@ msgstr ""
msgid "Default encrypted root password on provisioned hosts"
msgstr ""

#, fuzzy
msgid "Default location"
msgstr "Default value"
msgstr ""

msgid "Default on login"
msgstr ""

#, fuzzy
msgid "Default organization"
msgstr "Organizations and/or"
msgstr ""

msgid "Default owner on provisioned hosts, if empty Foreman will use current user"
msgstr ""
Expand All @@ -2098,9 +2093,8 @@ msgstr ""
msgid "Default templates are automatically added to new organizations and locations"
msgstr ""

#, fuzzy
msgid "Default value"
msgstr "Default value"
msgstr ""

msgid "Default value of variable"
msgstr ""
Expand Down Expand Up @@ -2468,9 +2462,8 @@ msgstr ""
msgid "Domain"
msgstr ""

#, fuzzy
msgid "Domain ID"
msgstr "DNS domain"
msgstr ""

msgid "Domain IDs"
msgstr ""
Expand Down Expand Up @@ -2516,9 +2509,8 @@ msgstr ""
msgid "EFI"
msgstr ""

#, fuzzy
msgid "ENC environment"
msgstr "Environment"
msgstr ""

msgid "ERROR or FATAL"
msgstr ""
Expand Down Expand Up @@ -2622,9 +2614,8 @@ msgstr ""
msgid "Enable this host for provisioning"
msgstr ""

#, fuzzy
msgid "Enabled"
msgstr "Partition Table"
msgstr ""

msgid "Enabled %s for reboot and rebuild"
msgstr ""
Expand All @@ -2648,9 +2639,8 @@ msgstr ""
msgid "Environment Distribution"
msgstr ""

#, fuzzy
msgid "Environment ID"
msgstr "Name"
msgstr ""

msgid "Environment IDs"
msgstr ""
Expand Down Expand Up @@ -3366,9 +3356,8 @@ msgstr ""
msgid "GMT time"
msgstr ""

#, fuzzy
msgid "Gateway"
msgstr "Gateway address"
msgstr ""

msgid "Gateway Address"
msgstr ""
Expand Down Expand Up @@ -3586,9 +3575,8 @@ msgstr ""
msgid "Host Group Parameters"
msgstr ""

#, fuzzy
msgid "Host Groups"
msgstr "Host Group"
msgstr ""

msgid "Host Parameters"
msgstr ""
Expand All @@ -3612,19 +3600,17 @@ msgstr ""
msgid "Host group IDs"
msgstr ""

#, fuzzy
msgid "Host group and Environment"
msgstr "Environment"
msgstr ""

msgid "Host group description"
msgstr ""

msgid "Host group matchers inheritance"
msgstr ""

#, fuzzy
msgid "Host group only"
msgstr "Host Group"
msgstr ""

msgid "Host groups"
msgstr ""
Expand Down Expand Up @@ -5468,9 +5454,8 @@ msgstr ""
msgid "Name of the external auth source where unknown externally authentication users (see authorize_login_delegation) should be created (keep unset to prevent the autocreation)"
msgstr ""

#, fuzzy
msgid "Name of the host group"
msgstr "Host Group"
msgstr ""

msgid "Name of the parameter"
msgstr ""
Expand Down Expand Up @@ -5687,9 +5672,8 @@ msgstr ""
msgid "No comment provided"
msgstr ""

#, fuzzy
msgid "No compute resource to show"
msgstr "Attributes"
msgstr ""

msgid "No data available"
msgstr ""
Expand Down Expand Up @@ -6092,13 +6076,11 @@ msgstr ""
msgid "Operating Systems"
msgstr ""

#, fuzzy
msgid "Operating system"
msgstr "Name"
msgstr ""

#, fuzzy
msgid "Operating system ID"
msgstr "Name"
msgstr ""

msgid "Operating system IDs"
msgstr ""
Expand Down Expand Up @@ -6205,9 +6187,8 @@ msgstr ""
msgid "Organization Distribution"
msgstr ""

#, fuzzy
msgid "Organization fact"
msgstr "Organizations and/or"
msgstr ""

msgid "Organization parameters"
msgstr ""
Expand Down Expand Up @@ -6370,9 +6351,8 @@ msgstr ""
msgid "Parent is already selected"
msgstr ""

#, fuzzy
msgid "Parent parameters"
msgstr "Host Group"
msgstr ""

msgid "Partition Table"
msgstr ""
Expand All @@ -6383,9 +6363,8 @@ msgstr ""
msgid "Partition table ID"
msgstr ""

#, fuzzy
msgid "Partition template IDs"
msgstr "Provisioning templates"
msgstr ""

msgid "Partition templates describe the partition layout, with just a different disk layout to account for different server capabilities."
msgstr ""
Expand Down Expand Up @@ -6815,9 +6794,8 @@ msgstr "Puppet class"
msgid "Puppetclass|Name"
msgstr "Class name"

#, fuzzy
msgid "Puppetrun"
msgstr "Puppet class"
msgstr ""

msgid "Query"
msgstr ""
Expand Down Expand Up @@ -7375,16 +7353,14 @@ msgstr ""
msgid "Select domains"
msgstr ""

#, fuzzy
msgid "Select environment"
msgstr "Environment"
msgstr ""

msgid "Select environments"
msgstr ""

#, fuzzy
msgid "Select host group"
msgstr "Host Group"
msgstr ""

msgid "Select host groups"
msgstr ""
Expand Down Expand Up @@ -7958,9 +7934,8 @@ msgstr ""
msgid "Statistics"
msgstr ""

#, fuzzy
msgid "Status"
msgstr "Status"
msgstr ""

msgid "Stop updating IP address and MAC values from Puppet facts (affects all interfaces)"
msgstr ""
Expand Down Expand Up @@ -7993,9 +7968,8 @@ msgstr ""
msgid "Subnet"
msgstr ""

#, fuzzy
msgid "Subnet ID"
msgstr "End of IP range"
msgstr ""

msgid "Subnet IDs"
msgstr ""
Expand Down Expand Up @@ -8155,9 +8129,8 @@ msgstr ""
msgid "System Information"
msgstr ""

#, fuzzy
msgid "System Status"
msgstr "Status"
msgstr ""

msgid "TFTP"
msgstr ""
Expand Down Expand Up @@ -8401,7 +8374,6 @@ msgid ""
" then the domain is <b>somewhere.com</b>."
msgstr ""

#, fuzzy
msgid "The %{proxy_type} proxy could not be set for host: %{host_names}."
msgid_plural "The %{proxy_type} puppet ca proxy could not be set for hosts: %{host_names}"
msgstr[0] ""
Expand Down Expand Up @@ -9579,9 +9551,8 @@ msgid "User|Lastname"
msgstr "Surname"

#. TRANSLATORS: "Table name" or "Table name|Column name" for error messages
#, fuzzy
msgid "User|Locale"
msgstr "Email address"
msgstr ""

#. TRANSLATORS: "Table name" or "Table name|Column name" for error messages
msgid "User|Login"
Expand All @@ -9596,9 +9567,8 @@ msgid "User|Mail"
msgstr "Email address"

#. TRANSLATORS: "Table name" or "Table name|Column name" for error messages
#, fuzzy
msgid "User|Mail enabled"
msgstr "First name"
msgstr ""

#. TRANSLATORS: "Table name" or "Table name|Column name" for error messages
msgid "User|Password hash"
Expand Down Expand Up @@ -10641,9 +10611,8 @@ msgstr ""
msgid "or"
msgstr ""

#, fuzzy
msgid "organization"
msgstr "Organizations and/or"
msgstr ""

msgid "organizations"
msgstr ""
Expand Down Expand Up @@ -10823,9 +10792,8 @@ msgstr ""
msgid "unknown parent permission for %s"
msgstr ""

#, fuzzy
msgid "unknown permission %s"
msgstr "Permissions"
msgstr ""

msgid "unknown permission for %s"
msgstr ""
Expand Down

0 comments on commit 3f2702c

Please sign in to comment.