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
33a1777a5a
commit
d664b8fdbf
2 changed files with 21 additions and 0 deletions
|
@ -1,7 +1,21 @@
|
|||
[Desktop Entry]
|
||||
Name=Eye on Screen
|
||||
Name[ca]=Ull a la pantalla
|
||||
Name[et]=Eye on Screen
|
||||
Name[nl]=Oog op scherm
|
||||
Name[pt]=Olho no Ecrã
|
||||
Name[sv]=Ögat på skärmen
|
||||
Name[uk]=Око на екрані
|
||||
Name[x-test]=xxEye on Screenxx
|
||||
Icon=preferences-system-windows-effect-eyeonscreen
|
||||
Comment=Suck windows into the desktop
|
||||
Comment[ca]=Enganxa les finestres a l'escriptori
|
||||
Comment[et]=Akende imemine töölauale
|
||||
Comment[nl]=Zuig vensters in het bureaublad
|
||||
Comment[pt]=Aspira as janelas para o ecrã
|
||||
Comment[sv]=Sug in fönster i skrivbordet
|
||||
Comment[uk]=Засмоктування вікон до стільниці
|
||||
Comment[x-test]=xxSuck windows into the desktopxx
|
||||
|
||||
Type=Service
|
||||
X-Plasma-API=javascript
|
||||
|
|
|
@ -42,6 +42,13 @@ Name[zh_CN]=窗口光圈
|
|||
Name[zh_TW]=視窗光圈
|
||||
Icon=preferences-system-windows-effect-windowaperture
|
||||
Comment=Move windows into screen corners
|
||||
Comment[ca]=Mou les finestres cap a les cantonades de la pantalla
|
||||
Comment[et]=Akende liigutamine ekraani nurkadesse
|
||||
Comment[nl]=Verplaats vensters in de hoeken van het scherm
|
||||
Comment[pt]=Mover as janelas para os cantos do ecrã
|
||||
Comment[sv]=Flytta fönster till skärmhörn
|
||||
Comment[uk]=Пересування вікон до кутів екрана
|
||||
Comment[x-test]=xxMove windows into screen cornersxx
|
||||
|
||||
Type=Service
|
||||
X-Plasma-API=javascript
|
||||
|
|
Loading…
Reference in a new issue