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/work/fvogt/fakevmblank
l10n daemon script 5 years ago
parent 1dae29175f
commit f7e2f5504a
5 changed files with 10 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. 2
      src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
  2. 2
      src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
  3. 2
      src/plugins/kpackage/effect/kwin-packagestructure-effect.json
  4. 2
      src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
  5. 2
      src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json

2
src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
Unescape View File

@ -10,6 +10,7 @@
"Name[cs]": "Demitrius Belai",
"Name[en_GB]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[eu]": "Demitrius Belai",
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
@ -28,6 +29,7 @@
"Name[cs]": "KWin Aurorae",
"Name[en_GB]": "KWin Aurorae",
"Name[es]": "KWin Aurorae",
"Name[eu]": "KWin Aurorae",
"Name[fr]": "KWin Aurorae",
"Name[it]": "KWin Aurorae",
"Name[ko]": "KWin Aurorae",

2
src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
Unescape View File

@ -10,6 +10,7 @@
"Name[cs]": "Demitrius Belai",
"Name[en_GB]": "Demitrius Belai",
"Name[es]": "Demitrius Belai",
"Name[eu]": "Demitrius Belai",
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
@ -28,6 +29,7 @@
"Name[cs]": "Dekorace KWin",
"Name[en_GB]": "KWin Decoration",
"Name[es]": "Decoración de KWin",
"Name[eu]": "KWin apainketa",
"Name[fr]": "Décorations pour KWin",
"Name[it]": "Decorazione di KWin",
"Name[ko]": "KWin 장식",

2
src/plugins/kpackage/effect/kwin-packagestructure-effect.json
Unescape View File

@ -10,6 +10,7 @@
"Name[cs]": "Vlad Zahorodnii",
"Name[en_GB]": "Vlad Zahorodnii",
"Name[es]": "Vlad Zahorodnii",
"Name[eu]": "Vlad Zahorodnii",
"Name[fr]": "Vlad Zahorodnii",
"Name[it]": "Vlad Zahorodnii",
"Name[ko]": "Vlad Zahorodnii",
@ -28,6 +29,7 @@
"Name[cs]": "Efekt KWinu",
"Name[en_GB]": "KWin Effect",
"Name[es]": "Efecto de KWin",
"Name[eu]": "KWin efektua",
"Name[fr]": "Effet pour KWin",
"Name[it]": "Effetto di KWin",
"Name[ko]": "KWin 효과",

2
src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
Unescape View File

@ -10,6 +10,7 @@
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
@ -28,6 +29,7 @@
"Name[cs]": "Skript KWinu",
"Name[en_GB]": "KWin Script",
"Name[es]": "Guion de KWin",
"Name[eu]": "KWin gidoia",
"Name[fr]": "Script pour KWin",
"Name[it]": "Script di KWin",
"Name[ko]": "KWin 스크립트",

2
src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
Unescape View File

@ -10,6 +10,7 @@
"Name[cs]": "Marco Martin",
"Name[en_GB]": "Marco Martin",
"Name[es]": "Marco Martin",
"Name[eu]": "Marco Martin",
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
@ -28,6 +29,7 @@
"Name[cs]": "Přepínač oken KWin",
"Name[en_GB]": "KWin Window Switcher",
"Name[es]": "Selector de ventanas de KWin",
"Name[eu]": "KWin leiho-aldatzailea",
"Name[fr]": "Sélecteur de fenêtres de KWin",
"Name[it]": "Scambiafinestre di KWin",
"Name[ko]": "KWin 창 전환기",

Write Preview
Loading…
Cancel
Save