From 47cb5c144ec841dfc1088e0e0aca05bdb021effb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 May 2023 02:21:31 +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" --- .../switchers/thumbnail_grid/metadata.json | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/tabbox/switchers/thumbnail_grid/metadata.json b/src/tabbox/switchers/thumbnail_grid/metadata.json index 5f97a9e6b3..8498eabaef 100644 --- a/src/tabbox/switchers/thumbnail_grid/metadata.json +++ b/src/tabbox/switchers/thumbnail_grid/metadata.json @@ -4,14 +4,44 @@ "Authors": [ { "Email": "zrenfire@gmail.com", - "Name": "Chris Holland" + "Name": "Chris Holland", + "Name[ar]": "كريس هولاند", + "Name[bg]": "Chris Holland", + "Name[ca]": "Chris Holland", + "Name[es]": "Chris Holland", + "Name[ia]": "Chris Holland", + "Name[it]": "Chris Holland", + "Name[nl]": "Chris Holland", + "Name[sl]": "Chris Holland", + "Name[tr]": "Chris Holland", + "Name[x-test]": "xxChris Hollandxx" } ], "Description": "A window switcher layout using a small grid of thumbnails", + "Description[ar]": "مخطط مبدل نوافذ يستخدم شبكة صغيرة من المصغرات", + "Description[bg]": "Оформление на превключвател на прозорци, използващ решетка от миниатюри", + "Description[ca]": "Una disposició del commutador de finestres que utilitza una quadrícula petita de miniatures", + "Description[es]": "Un esquema de selector de ventanas que usa una pequeña cuadrícula de miniaturas", + "Description[ia]": "Un disposition de commutator de fenestra usante un parve grillia de miniaturas", + "Description[it]": "Una disposizione per il cambio finestra che utilizza una piccola griglia di miniature", + "Description[nl]": "Een indeling van de vensterwisselaar met een klein raster van miniaturen", + "Description[sl]": "Okenski preklopnik postavitve z uporabo majhne mreže predoglednih sličic", + "Description[tr]": "Küçük bir küçük görsel ızgarası kullanan pencere değiştirici yerleşimi", + "Description[x-test]": "xxA window switcher layout using a small grid of thumbnailsxx", "Icon": "preferences-system-windows-switcher-thumbnail-grid", "Id": "thumbnail_grid", "License": "GPL", "Name": "Thumbnail Grid", + "Name[ar]": "شبكة المصغرات", + "Name[bg]": "Миниатюри в решетка", + "Name[ca]": "Quadrícula de miniatures", + "Name[es]": "Cuadrícula de miniaturas", + "Name[ia]": "Grillia de Miniatura", + "Name[it]": "Griglia delle miniature", + "Name[nl]": "Raster voor miniaturen", + "Name[sl]": "Mreža predoglednih sličic", + "Name[tr]": "Küçük Görsel Izgarası", + "Name[x-test]": "xxThumbnail Gridxx", "Version": "6" }, "X-Plasma-API": "declarativeappletscript",