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
0c3047a8f1
commit
8dd23c5054
1 changed files with 2 additions and 2 deletions
|
@ -80,7 +80,7 @@ Comment[lt]=Kompozitoriaus nustatymai skirti darbalaukio efektams
|
|||
Comment[nb]=Sammensetter-innstillinger for skrivebordseffekter
|
||||
Comment[nds]=Tosamensettoptschonen för de Schriefdischeffekten instellen
|
||||
Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten
|
||||
Comment[nn]=Samansetjarinnstillingar for skrivebordseffekter
|
||||
Comment[nn]=Samansetjarinnstillingar for skrivebordseffektar
|
||||
Comment[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ ਲਈ ਕੰਪੋਜੀਟਰ ਸੈਟਿੰਗਾਂ
|
||||
Comment[pl]=Ustawienia kompozytora dla efektów pulpitu
|
||||
Comment[pt]=Configuração do Compositor para os Efeitos do Ecrã
|
||||
|
@ -118,7 +118,7 @@ X-KDE-Keywords[id]=kwin,jendela,pengelola,kompositing,efek,efek 3D,efek 2D,OpenG
|
|||
X-KDE-Keywords[it]=kwin,finestra,gestore,composizione,effetto,effetti 3D,effetti 2D,OpenGL,XRender,impostazioni video,effetti grafici,effetti del desktop,velocità delle animazioni
|
||||
X-KDE-Keywords[ko]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects,animation speed,3D 효과,2D 효과,비디오 설정,그래픽 설정,그래픽 효과,데스크톱 효과,애니메이션 속도
|
||||
X-KDE-Keywords[nl]=kwin,window,manager,beheerder,compositing,effecten,3D-effecten,2D-effecten,OpenGL,XRender,video-instellingen,grafische effecten,bureaubladeffecten,animatiesneleheid
|
||||
X-KDE-Keywords[nn]=kwin,vindauge,vindaugshandsamar,samansetjing,effekt,3D-effektar,2D-effektar,OpenGL,XRender,videoinnstillingar,grafiske effektar,skrivebordseffekter,animasjonsfart
|
||||
X-KDE-Keywords[nn]=kwin,vindauge,vindaugshandsamar,samansetjing,effekt,3D-effektar,2D-effektar,OpenGL,XRender,videoinnstillingar,grafiske effektar,skrivebordseffektar,animasjonsfart
|
||||
X-KDE-Keywords[pl]=kwin,okno,menadżer,menedżer,zarządca,kompozytor,efekt,efekt 3D,efekt 2D,OpenGL,XRender,ustawienia wideo,efekty graficzne,efekty pulpitu,szybkość animacji
|
||||
X-KDE-Keywords[pt]=kwin,janela,gestor,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configuração do vídeo,efeitos gráficos,efeitos do ecrã,velocidade da animação
|
||||
X-KDE-Keywords[pt_BR]=kwin,janela,gerenciador,composição,efeito,efeitos 3D,efeitos 2D,OpenGL,XRender,configurações de vídeo,efeitos gráficos,efeitos da área de trabalho,velocidade da animação
|
||||
|
|
Loading…
Reference in a new issue