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 2017-01-23 05:49:39 +01:00
parent 03efd67853
commit 1e4fbcc5ed
6 changed files with 14 additions and 0 deletions

View file

@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Effects
Name[es]=Efectos del gestor de ventanas
Name[ia]=Gerente de effectos de fenestra
Name[it]=Effetti del gestore delle finestre
Name[ko]=창 관리자 효과
Name[nl]=Effecten van vensterbeheerder
Name[nn]=Effektar for vindaugshandsamar
Name[pl]=Efekty zarządzania oknami

View file

@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Scripts
Name[es]=Guiones del gestor de ventanas
Name[ia]=Gerente de scripts de fenestra
Name[it]=Script del gestore delle finestre
Name[ko]=창 관리자 스크립트
Name[nl]=Scripts van vensterbeheerder
Name[nn]=Skript for vindaugshandsamar
Name[pl]=Skrypty zarządzania oknami

View file

@ -7,6 +7,7 @@ Name[en_GB]=Window Manager Switching Layouts
Name[es]=Esquemas de cambio del gestor de ventanas
Name[ia]=Disposition de commutator de gerente de fenestra
Name[it]=Disposizione scambiafinestre del gestore delle finestre
Name[ko]=창 관리자 전환기 레이아웃
Name[nl]=Omschakelende indelingen van vensterbeheerder
Name[pl]=Układ przełączania zarządzana oknami
Name[pt]=Disposições da Mudança de Janelas do KWin

View file

@ -1,7 +1,12 @@
[Desktop Entry]
Name=KWin Script
Name[ca]=Script del KWin
Name[ca@valencia]=Script del KWin
Name[en_GB]=KWin Script
Name[it]=Script di KWin
Name[ko]=KWin
Name[nl]=KWin-script
Name[pl]=Skrypt KWin
Name[pt]=Programa do KWin
Name[sv]=Kwin-skript
Name[uk]=Скрипт KWin

View file

@ -1,7 +1,12 @@
[Desktop Entry]
Name=KWin Window Switcher
Name[ca]=Commutador de finestres del KWin
Name[ca@valencia]=Commutador de finestres del KWin
Name[en_GB]=KWin Window Switcher
Name[it]=Scambiafinestre di KWin
Name[ko]=KWin
Name[nl]=KWin-vensterwisselaar
Name[pl]=Przełącznik okien KWin
Name[pt]=Mudança de Janelas do KWin
Name[sv]=Kwin-fönsterbyte
Name[uk]=Перемикач вікон KWin

View file

@ -7,6 +7,7 @@ Name[en_GB]=Aurorae Window Decorations
Name[es]=Decoración de ventanas Aurorae
Name[ia]=Decorationes de fenestra Aurorae
Name[it]=Decorazioni delle finestre Aurorae
Name[ko]=Aurorae 창 장식
Name[nl]=Aurorea-vensterdecoraties
Name[pl]=Ozdoby okienne Aurorae
Name[pt]=Decorações das Janelas do Aurorae