From 33fb2ccc40ba8277c03a593ac2763fd5418d04fd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 22 May 2023 02:23:28 +0000 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/tabbox/switchers/thumbnail_grid/metadata.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tabbox/switchers/thumbnail_grid/metadata.json b/src/tabbox/switchers/thumbnail_grid/metadata.json index e2d1623094..54edf55f17 100644 --- a/src/tabbox/switchers/thumbnail_grid/metadata.json +++ b/src/tabbox/switchers/thumbnail_grid/metadata.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Chris Holland", "Name[ca]": "Chris Holland", "Name[de]": "Chris Holland", + "Name[en_GB]": "Chris Holland", "Name[es]": "Chris Holland", "Name[fr]": "Chris Holland", "Name[ia]": "Chris Holland", @@ -31,6 +32,7 @@ "Description[ca@valencia]": "Una disposició del commutador de finestres que utilitza una quadrícula xicoteta de miniatures", "Description[ca]": "Una disposició del commutador de finestres que utilitza una quadrícula petita de miniatures", "Description[de]": "Ein Fensterwechsler-Layout, das ein Raster von kleinen Vorschaubildern verwendet", + "Description[en_GB]": "A window switcher layout using a small grid of thumbnails", "Description[es]": "Un esquema de selector de ventanas que usa una pequeña cuadrícula de miniaturas", "Description[fr]": "Une disposition du sélecteur de fenêtres utilisant une petite grille de vignettes.", "Description[ia]": "Un disposition de commutator de fenestra usante un parve grillia de miniaturas", @@ -51,6 +53,7 @@ "Name[ca@valencia]": "Quadrícula de miniatures", "Name[ca]": "Quadrícula de miniatures", "Name[de]": "Vorschaubilder-Raster", + "Name[en_GB]": "Thumbnail Grid", "Name[es]": "Cuadrícula de miniaturas", "Name[fr]": "Grille de vignettes", "Name[ia]": "Grillia de Miniatura",