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
e4349536a3
commit
34545553b2
1 changed files with 2 additions and 0 deletions
|
@ -2,6 +2,7 @@
|
|||
"KPlugin": {
|
||||
"Category": "Accessibility",
|
||||
"Description": "Hide mouse cursor on inactivity or keyboard input",
|
||||
"Description[bg]": "Скриване показалеца на мишката при бездействие или при въвеждане от клавиатурата",
|
||||
"Description[ca@valencia]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
|
||||
"Description[ca]": "Oculta el cursor del ratolí per inactivitat o per entrada de teclat",
|
||||
"Description[eo]": "Kaŝi muskursoron je neaktiveco aŭ klavara enigo",
|
||||
|
@ -24,6 +25,7 @@
|
|||
"EnabledByDefault": false,
|
||||
"License": "GPL",
|
||||
"Name": "Hide Cursor",
|
||||
"Name[bg]": "Скриване показалеца на мишката",
|
||||
"Name[ca@valencia]": "Oculta el cursor",
|
||||
"Name[ca]": "Oculta el cursor",
|
||||
"Name[eo]": "Kaŝi Kursoron",
|
||||
|
|
Loading…
Reference in a new issue