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 2018-01-19 05:11:45 +01:00
parent 04d8434a09
commit 6574253a65
4 changed files with 4 additions and 0 deletions

View file

@ -8,6 +8,7 @@
"Description[es]": "Complemento compositor de KWin renderizando mediante OpenGL",
"Description[fi]": "OpenGL:llä hahmontava KWin-koostajaliitännäinen",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec OpenGL",
"Description[gl]": "Complemento de compositor de KWin que renderiza a través de OpenGL.",
"Description[it]": "Estensione del compositore di KWin per la resa tramite OpenGL",
"Description[ko]": "OpenGL로 렌더링하는 KWin 컴포지터 플러그인",
"Description[nl]": "KWin-compositor-plug-in rendering via OpenGL",

View file

@ -10,6 +10,7 @@
"Description[es]": "Complemento compositor de KWin renderizando mediante QPainter",
"Description[fi]": "QPainterillä hahmontava KWin-koostajaliitännäinen",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec QPainter",
"Description[gl]": "Complemento de compositor de KWin que renderiza a través de QPainter.",
"Description[it]": "Estensione del compositore di KWin per la resa tramite QPainter",
"Description[ko]": "QPainter로 렌더링하는 KWin 컴포지터 플러그인",
"Description[nl]": "KWin-compositor-plug-in rendering via QPainter",

View file

@ -10,6 +10,7 @@
"Description[es]": "Complemento compositor de KWin renderizando mediante XRender",
"Description[fi]": "XRenderillä hahmontava KWin-koostajaliitännäinen",
"Description[fr]": "Module du compositeur KWin effectuant le rendu avec XRender",
"Description[gl]": "Complemento de compositor de KWin que renderiza a través de XRender.",
"Description[it]": "Estensione del compositore di KWin per la resa tramite XRender",
"Description[ko]": "XRender로 렌더링하는 KWin 컴포지터 플러그인",
"Description[nl]": "KWin-compositor-plug-in rendering via XRender",

View file

@ -45,6 +45,7 @@ Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les fin
Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen
Comment[en_GB]=Adds a shortcut to minimise and restore all windows
Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventanas
Comment[gl]=Engade un atallo para minimizar e restaurar todas as xanelas.
Comment[it]=Aggiunge una scorciatoia per minimizzare e ripristinare tutte le finestre
Comment[nl]=Voegt een sneltoets toe om alle vensters te minimaliseren en te herstellen
Comment[pl]=Dodaje skrót do zminimalizowania i przywracania wszystkich okien