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-11-30 02:05:05 +00:00
parent 7787920277
commit 2ad4bb6de3

View file

@ -2,16 +2,30 @@
"KPlugin": {
"Category": "Accessibility",
"Description": "Makes the cursor larger when the pointer is quickly moved back and forth",
"Description[ca@valencia]": "Fa el cursor més gran quan el punter es mou ràpidament cap avant i cap arrere",
"Description[ca]": "Fa el cursor més gran quan el punter es mou ràpidament cap endavant i cap enrere",
"Description[es]": "Agranda el cursor cuando el puntero se mueve rápidamente adelante y atrás",
"Description[eu]": "Kurtsorea handitzen du erakuslea aurrera eta atzera azkar mugitzen denean",
"Description[he]": "מגדיל את הסמן בעת הזזת המצביע הלוך ושוב במהירות",
"Description[ka]": "კურსორის გადიდება, როცა მას წინ და უკან სწრაფად გააქანებთ",
"Description[nl]": "Maakt de cursor groter wanneer de aanwijzer snel heen en weer wordt bewogen",
"Description[sl]": "Poveča kazalec, kadar se kazalec hitro premika naprej in nazaj",
"Description[tr]": "İşaretçi hızla ileri geri hareket ettirildiğinde imleci büyütür",
"Description[uk]": "Робити курсор більшим, коли вказівник швидко рухається туди-сюди",
"Description[x-test]": "xxMakes the cursor larger when the pointer is quickly moved back and forthxx",
"Description[zh_TW]": "快速來回移動游標時讓游標變大",
"EnabledByDefault": false,
"License": "GPL",
"Name": "Shake Cursor",
"Name[ca@valencia]": "Sacsa el cursor",
"Name[ca]": "Sacseja el cursor",
"Name[es]": "Sacudir el cursor",
"Name[eu]": "Astindu kurtsorea",
"Name[he]": "ניעור סמן",
"Name[ka]": "კურსორის ჯანჯღარი",
"Name[nl]": "Cursor schudden",
"Name[sl]": "Stresaj kazalko",
"Name[tr]": "İmleci Salla",
"Name[uk]": "Бовтанка курсора",
"Name[x-test]": "xxShake Cursorxx",
"Name[zh_TW]": "甩動游標"