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
3cc8e9f13b
commit
5b4dce93e3
1 changed files with 2 additions and 0 deletions
|
@ -8,6 +8,7 @@
|
|||
"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[fr]": "Agrandit le curseur lorsque le pointeur est rapidement déplacé d’avant en arrière",
|
||||
"Description[gl]": "Aumenta o cursor ao movelo rapidamente dun lado a outro.",
|
||||
"Description[he]": "מגדיל את הסמן בעת הזזת המצביע הלוך ושוב במהירות",
|
||||
"Description[ia]": "Face le cursor plus grande quando le punctator es rapidemente movite retro e avante",
|
||||
"Description[ka]": "კურსორის გადიდება, როცა მას წინ და უკან სწრაფად გააქანებთ",
|
||||
|
@ -27,6 +28,7 @@
|
|||
"Name[es]": "Sacudir el cursor",
|
||||
"Name[eu]": "Astindu kurtsorea",
|
||||
"Name[fr]": "Agiter le pointeur",
|
||||
"Name[gl]": "Axitar o cursor",
|
||||
"Name[he]": "ניעור סמן",
|
||||
"Name[ia]": "Agita Cursor",
|
||||
"Name[ka]": "კურსორის ჯანჯღარი",
|
||||
|
|
Loading…
Reference in a new issue