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"
This commit is contained in:
l10n daemon script 2023-06-23 02:33:21 +00:00
parent acd281f04d
commit 5dbe7d7adc
3 changed files with 10 additions and 1 deletions

View file

@ -1,11 +1,14 @@
{
"KPlugin": {
"Description": "Window Decoration Theme Engine",
"Description[ar]": "محرك سمات زخارف النوافذ",
"Description[bg]": "Основна програма (енджин) на темата за декорации на прозорци",
"Description[ca@valencia]": "Motor del tema de decoració de les finestres",
"Description[ca]": "Motor de tema de decoració de les finestres",
"Description[en_GB]": "Window Decoration Theme Engine",
"Description[eo]": "Fenestrodekora Etosmotoro",
"Description[es]": "Motor de temas de decoraciones de las ventanas",
"Description[eu]": "Leiho-apaindura gaien motorra",
"Description[ia]": "Motor de Thema de Decoratione de fenestra",
"Description[it]": "Motore dei temi delle decorazioni delle finestre",
"Description[ka]": "ფანჯრის დეკორაციის თემის ძრავა",
@ -16,12 +19,15 @@
"Description[x-test]": "xxWindow Decoration Theme Enginexx",
"Description[zh_CN]": "窗口装饰主题引擎",
"Name": "Aurorae",
"Name[ar]": "أورورا",
"Name[bg]": "Aurorae",
"Name[ca@valencia]": "Aurorae",
"Name[ca]": "Aurorae",
"Name[de]": "Aurorae",
"Name[en_GB]": "Aurorae",
"Name[eo]": "Aurorae",
"Name[es]": "Aurorae",
"Name[eu]": "Aurorae",
"Name[ia]": "Aurorae",
"Name[it]": "Aurorae",
"Name[ka]": "ავრორა",

View file

@ -8,7 +8,7 @@
"Description[bg]": "Плъзгаща се анимация за изскачащи прозорци на Plasma",
"Description[ca@valencia]": "Animació de desplaçament per als missatges emergents de Plasma",
"Description[ca]": "Animació de desplaçament per als missatges emergents del Plasma",
"Description[cs]": "Animace klouzání vyskakovacích oken plasmy",
"Description[cs]": "Animace klouzání vyskakovacích oken Plasma",
"Description[de]": "Effekt zum Hereingleiten von Plasma-Aufklappfenstern",
"Description[en_GB]": "Sliding animation for Plasma popups",
"Description[eo]": "Glita animacio por Plasma ŝprucfenestroj",

View file

@ -14,6 +14,7 @@
"Name[en_GB]": "Chris Holland",
"Name[eo]": "Chris Holland",
"Name[es]": "Chris Holland",
"Name[eu]": "Chris Holland",
"Name[fr]": "Chris Holland",
"Name[ia]": "Chris Holland",
"Name[it]": "Chris Holland",
@ -40,6 +41,7 @@
"Description[en_GB]": "A window switcher layout using a small grid of thumbnails",
"Description[eo]": "Fenestroŝaltila aranĝo uzante malgrandan kradon de bildetoj",
"Description[es]": "Un esquema de selector de ventanas que usa una pequeña cuadrícula de miniaturas",
"Description[eu]": "Koadro txikien sareta txiki bat erabiltzen duen leiho-trukatzaile antolaera bat",
"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",
"Description[it]": "Una disposizione per il cambio finestra che utilizza una piccola griglia di miniature",
@ -67,6 +69,7 @@
"Name[en_GB]": "Thumbnail Grid",
"Name[eo]": "Bildeta Krado",
"Name[es]": "Cuadrícula de miniaturas",
"Name[eu]": "Koadro txikien sareta",
"Name[fr]": "Grille de vignettes",
"Name[ia]": "Grillia de Miniatura",
"Name[it]": "Griglia delle miniature",