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:
parent
d8e1637dcd
commit
dd698378ea
1 changed files with 21 additions and 1 deletions
|
@ -2,8 +2,28 @@
|
||||||
"KPlugin": {
|
"KPlugin": {
|
||||||
"Category": "Appearance",
|
"Category": "Appearance",
|
||||||
"Description": "Highlights screen edges and corners that trigger actions when touched as the cursor approaches them",
|
"Description": "Highlights screen edges and corners that trigger actions when touched as the cursor approaches them",
|
||||||
|
"Description[ca]": "Ressalta les vores de la pantalla i les cantonades que activen accions quan es toquen si el cursor s'hi aproxima",
|
||||||
|
"Description[es]": "Resalta los bordes y las esquinas de la pantalla que desencadenan acciones cuando se tocan al aproximar el cursor",
|
||||||
|
"Description[eu]": "Pantailaren ertzak eta kurtsorea hurbiltzean ukitzen dituenean ekitzak eragiten dituzten izkinak nabarmentzen ditu",
|
||||||
|
"Description[he]": "הדגשת קצוות המסך שמזניקות פעולות כשנוגעים בהן כשהסמן מגיע אליהן",
|
||||||
|
"Description[ka]": "გამოკვეთს ეკრანის წიბოებს და კუთხეებს, რომლებიც ატრიგერებენ ქმედებას შეხებისას, როცა მათ კურსორი უახლოვდება",
|
||||||
|
"Description[nl]": "Accentueert schermranden en hoeken die acties starten bij aanraken als de cursor ze benaderd",
|
||||||
|
"Description[sl]": "Osvetli robove in vogale zaslona, ki ob dotiku sprožijo dejanja, ko se jim približa kazalka",
|
||||||
|
"Description[sv]": "Markerar skärmkanter och hörn som utlöser åtgärder om de berörs när markören närmar sig",
|
||||||
|
"Description[tr]": "İmleç onlara yaklaştıkça dokunulduğunda eylemleri tetikleyen ekran kenarlarını ve köşeleri vurgular",
|
||||||
|
"Description[x-test]": "xxHighlights screen edges and corners that trigger actions when touched as the cursor approaches themxx",
|
||||||
"EnabledByDefault": true,
|
"EnabledByDefault": true,
|
||||||
"License": "GPL",
|
"License": "GPL",
|
||||||
"Name": "Highlight Screen Edges and Hot Corners"
|
"Name": "Highlight Screen Edges and Hot Corners",
|
||||||
|
"Name[ca]": "Ressalta les vores de la pantalla i les cantonades actives",
|
||||||
|
"Name[es]": "Resaltar los bordes y las esquinas activas de la pantalla",
|
||||||
|
"Name[eu]": "Nabarmendu pantailaren ertzak eta izkina beroak",
|
||||||
|
"Name[he]": "הדגשת קצוות המסך והפינות החמות",
|
||||||
|
"Name[ka]": "ეკრანის წიბოებისა და აქტიური კუთხეები გამოკვეთა",
|
||||||
|
"Name[nl]": "Accentueert schermranden en actieve hoeken",
|
||||||
|
"Name[sl]": "Poudari robove zaslona in vroče vogale",
|
||||||
|
"Name[sv]": "Markerar skärmkanter och aktiva hörn",
|
||||||
|
"Name[tr]": "Ekran Kenarlarını ve Sıcak Köşeleri Vurgula",
|
||||||
|
"Name[x-test]": "xxHighlight Screen Edges and Hot Cornersxx"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue