wilderjds
/
kwin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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/origin/alexeymin/automatic-backend-selection
l10n daemon script 7 years ago
parent 4ece0a9f40
commit 1b8e5061ab
2 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      kcmkwin/kwindecoration/kwindecoration.desktop
  2. 1
      kcmkwin/kwindecoration/package/metadata.desktop

1
kcmkwin/kwindecoration/kwindecoration.desktop
Unescape View File

@ -75,6 +75,7 @@ Name[zh_TW]=視窗裝飾
Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[ca@valencia]=Configura la barra de títol i les vores de les finestres
Comment[da]=Indstil vinduets titellinjer og kanter
Comment[en_GB]=Configure window titlebars and borders
Comment[es]=Configurar barra de título y bordes de las ventanas
Comment[fr]=Configure les barres de titre et les bordures de la fenêtre

1
kcmkwin/kwindecoration/package/metadata.desktop
Unescape View File

@ -77,6 +77,7 @@ Name[zh_TW]=視窗裝飾
Comment=Configure window titlebars and borders
Comment[ca]=Configura la barra de títol i les vores de les finestres
Comment[ca@valencia]=Configura la barra de títol i les vores de les finestres
Comment[da]=Indstil vinduets titellinjer og kanter
Comment[en_GB]=Configure window titlebars and borders
Comment[es]=Configurar barra de título y bordes de las ventanas
Comment[fr]=Configure les barres de titre et les bordures de la fenêtre

Write Preview
Loading…
Cancel
Save