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"
remotes/offline-stg/wilder
l10n daemon script 7 years ago
parent e96da56f8c
commit 40477aff2d
  1. 1
      kcmkwin/kwindecoration/kwindecoration.desktop
  2. 1
      kcmkwin/kwindecoration/package/metadata.desktop

@ -76,6 +76,7 @@ Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[es]=Configurar barra de título y bordes de las ventanas
Comment[gl]=Configurar as barras de título e os bordos das xanelas
Comment[id]=Konfigurasikan tepi dan bilah-judul window
Comment[it]=Configura la barra del titolo e i bordi delle finestre
Comment[nl]=Titelbalken en randen van venster configureren
Comment[nn]=Set opp tittellinjer og vindaugsrammer

@ -78,6 +78,7 @@ Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[es]=Configurar barra de título y bordes de las ventanas
Comment[gl]=Configurar as barras de título e os bordos das xanelas
Comment[id]=Konfigurasikan tepi dan bilah-judul window
Comment[it]=Configura la barra del titolo e i bordi delle finestre
Comment[nl]=Titelbalken en randen van venster configureren
Comment[nn]=Set opp tittellinjer og vindaugsrammer

Loading…
Cancel
Save