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 2022-12-23 01:55:25 +00:00
parent 8c5f8e2fa5
commit ae605bab12
2 changed files with 4 additions and 0 deletions

View file

@ -2,6 +2,7 @@
"KPlugin": {
"Category": "Window Management",
"Description": "Editor for the tiling areas",
"Description[ar]": "محرر لترتيب المساحات",
"Description[bg]": "Редактиране на зоните на плочковидно разпределяне",
"Description[ca@valencia]": "Editor per a les àrees de mosaic",
"Description[ca]": "Editor per a les àrees de mosaic",
@ -20,6 +21,7 @@
"Id": "tileseditor",
"License": "GPL",
"Name": "Tiling Editor",
"Name[ar]": "محرر الترتيب",
"Name[bg]": "Редактор на разпределяне",
"Name[ca@valencia]": "Editor de mosaic",
"Name[ca]": "Editor de mosaic",

View file

@ -3,6 +3,7 @@
"KPlugin": {
"BugReportUrl": "https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_kwinxwayland",
"Description": "Select which keys will be globally available to legacy X11 apps",
"Description[ar]": "حدد أي المفاتيح التي ستكون متوفرة لتطبيقات اكس ١١ القديمة",
"Description[bg]": "Изберете, кои клавиши да бъдат достъпни на глобално ниво за X11 приложения с минали версии",
"Description[ca@valencia]": "Seleccioneu les tecles que estaran disponibles globalment a les aplicacions X11 antigues",
"Description[ca]": "Seleccioneu les tecles que seran disponibles globalment a les aplicacions X11 antigues",
@ -18,6 +19,7 @@
"Description[x-test]": "xxSelect which keys will be globally available to legacy X11 appsxx",
"Icon": "xorg",
"Name": "Legacy X11 App Support",
"Name[ar]": "دعم تطبيقات اكس١١ القديمة",
"Name[bg]": "Поддръжка на минали версии X11 приложения",
"Name[ca@valencia]": "Implementació de les aplicacions X11 antigues",
"Name[ca]": "Implementació de les aplicacions X11 antigues",