Skip to content

Commit

Permalink
Merge branch 'main' into ecobalyse
Browse files Browse the repository at this point in the history
  • Loading branch information
@very-smartin
very-smartin authored Oct 14, 2024
2 parents 9b29b75 + c507f2d commit a606d32
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 46 deletions.
18 changes: 10 additions & 8 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"highcharts": "^9.2.2",
"jquery-cropper": "^1.0.1",
"jquery-form": "^4.3.0",
"jquery-ui": "1.14.0",
"jquery-ui": "1.13.3",
"jsvectormap": "^1.6.0",
"leaflet": "^1.7.1",
"leaflet.markercluster": "1.5.3",
Expand Down Expand Up @@ -94,4 +94,4 @@
"url": "https://opencollective.com/openfoodfacts-server"
},
"snyk": true
}
}
49 changes: 23 additions & 26 deletions po/common/common.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6893,6 +6893,10 @@ msgctxt "report_problem_panel_title"
msgid "Report a problem"
msgstr "Report a problem"

msgctxt "report_problem_navigation"
msgid "Report a problem."
msgstr "Report a problem."

msgctxt "incomplete_or_incorrect_data_title"
msgid "Incomplete or incorrect information?"
msgstr "Incomplete or incorrect information?"
Expand All @@ -6913,6 +6917,7 @@ msgctxt "description"
msgid "Description"
msgstr "Description"

# duplicate with "report_problem_panel_title"
msgctxt "report_problem_navigation"
msgid "Report a problem"
msgstr "Report a problem"
Expand Down Expand Up @@ -7005,33 +7010,29 @@ msgctxt "knowledge_panels_ingredients_rare_crops_what_you_can_do_list_5"
msgid "and your health!"
msgstr "and your health!"

msgctxt "brands_example_beauty"
msgid "Nivea, Nivea Men"
msgstr "Nivea, Nivea Men"

msgctxt "categories_example_beauty"
msgid "Anti-dandruff shampoo, Whitening toothpaste"
msgstr "Anti-dandruff shampoo, Whitening toothpaste"
#msgctxt "brands_example_beauty"
#msgid "Nivea, Nivea Men"
#msgstr "Nivea, Nivea Men"

msgctxt "emb_codes_example_beauty"
msgid "EMB 53062"
msgstr "EMB 53062"
#msgctxt "categories_example_beauty"
#msgid "Anti-dandruff shampoo, Whitening toothpaste"
#msgstr "Anti-dandruff shampoo, Whitening toothpaste"

msgctxt "generic_name_example_beauty"
msgid "Anti-dandruff shampoo"
msgstr "Anti-dandruff shampoo"
#msgctxt "emb_codes_example_beauty"
#msgid "EMB 53062"
#msgstr "EMB 53062"

msgctxt "product_name_example_beauty"
msgid "Anti-Perspirant Stress Protect"
msgstr "Anti-Perspirant Stress Protect"
#msgctxt "generic_name_example_beauty"
#msgid "Anti-dandruff shampoo"
#msgstr "Anti-dandruff shampoo"

msgctxt "ingredients_text_example_beauty"
msgid "AQUA/WATER, SODIUM LAURETH SULFATE, DISODIUM COCOAMPHODIACETATE, GLYCOL DISTEARATE, COCAMIDE MEA"
msgstr "AQUA/WATER, SODIUM LAURETH SULFATE, DISODIUM COCOAMPHODIACETATE, GLYCOL DISTEARATE, COCAMIDE MEA"
#msgctxt "product_name_example_beauty"
#msgid "Anti-Perspirant Stress Protect"
#msgstr "Anti-Perspirant Stress Protect"

msgctxt "report_problem_navigation"
msgid "Report a problem"
msgstr "Report a problem"
#msgctxt "ingredients_text_example_beauty"
#msgid "AQUA/WATER, SODIUM LAURETH SULFATE, DISODIUM COCOAMPHODIACETATE, GLYCOL DISTEARATE, COCAMIDE MEA"
#msgstr "AQUA/WATER, SODIUM LAURETH SULFATE, DISODIUM COCOAMPHODIACETATE, GLYCOL DISTEARATE, COCAMIDE MEA"

msgctxt "created_by"
msgid "Created by"
Expand All @@ -7053,10 +7054,6 @@ msgctxt "knowledge_panels_ingredients_rare_crops_divinfood"
msgid "Open Food Facts participates in the European project <a href=\"https://divinfood.eu/\">DIVINFOOD</a> (funded from European Union’s Horizon 2020 research and innovation programme). DIVINFOOD aims to develop food chains that value under-utilised agrobiodiversity in order to act against the decline of biodiversity and to meet the growing expectations of consumers for healthy, local products that contribute to sustainable food systems."
msgstr "Open Food Facts participates in the European project <a href=\"https://divinfood.eu/\">DIVINFOOD</a> (funded from European Union’s Horizon 2020 research and innovation programme). DIVINFOOD aims to develop food chains that value under-utilised agrobiodiversity in order to act against the decline of biodiversity and to meet the growing expectations of consumers for healthy, local products that contribute to sustainable food systems."

msgctxt "open_in_crm"
msgid "Open in CRM"
msgstr "Open in CRM"

msgctxt "deny"
msgid "Deny"
msgstr "Deny"
Expand Down
10 changes: 0 additions & 10 deletions po/tags/tags.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,16 +664,6 @@ msgctxt "weighers:singular"
msgid "weigher"
msgstr ""

#. part of an url, put here the plural in your language, without caps, and by using hyphens instead of spaces
msgctxt "weighers:plural"
msgid "weighers"
msgstr "weighers"

#. part of an url, put here the singular in your language, without caps, and by using hyphens instead of spaces
msgctxt "weighers:singular"
msgid "weigher"
msgstr "weigher"

#. part of an url, put here the singular in your language, without caps, and by using hyphens instead of spaces
msgctxt "packaging_shapes:plural"
msgid "packaging-shapes"
Expand Down

0 comments on commit a606d32

Please sign in to comment.