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 2021-08-22 01:17:35 +00:00
parent 1490215f0d
commit 76d1de48a8
9 changed files with 16 additions and 1 deletions

View file

@ -14,7 +14,9 @@ Name[ca]=Vista general
Name[cs]=přehled
Name[es]=vista general
Name[eu]=Ikuspegi orokorra
Name[lt]=apžvalga
Name[nl]=overzicht
Name[sl]=pregled
Name[sv]=översikt
Name[uk]=огляд
Name[x-test]=xxoverviewxx

View file

@ -28,6 +28,7 @@ Name[fr]=Clavier virtuel
Name[ia]=Claviero virtual
Name[it]=Tastiera virtuale
Name[ko]=
Name[lt]=Virtuali klaviatūra
Name[nl]=Virtueel toetsenbord
Name[pl]=Klawiatura ekranowa
Name[pt]=Teclado Virtual
@ -52,6 +53,7 @@ Comment[fr]=Sélectionner quel clavier virtuel utiliser
Comment[ia]=Selectiona qual claviero virtual usar
Comment[it]=Seleziona quale tastiera virtuale utilizzare
Comment[ko]=
Comment[lt]=Pasirinkti, kurią virtualią klaviatūrą naudoti
Comment[nl]=Het te gebruiken virtuele toetsenbord selecteren
Comment[pl]=Wybierz której klawiatury ekranowej użyć
Comment[pt]=Seleccionar qual o teclado virtual a usar

View file

@ -17,6 +17,7 @@ Name[fr]=Clavier virtuel
Name[ia]=Claviero virtual
Name[it]=Tastiera virtuale
Name[ko]=
Name[lt]=Virtuali klaviatūra
Name[nl]=Virtueel toetsenbord
Name[pl]=Klawiatura ekranowa
Name[pt]=Teclado Virtual

View file

@ -14,6 +14,7 @@
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
"Name[lt]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai",
"Name[sk]": "Demitrius Belai",
@ -35,6 +36,7 @@
"Name[fr]": "KWin Aurorae",
"Name[it]": "KWin Aurorae",
"Name[ko]": "KWin Aurorae",
"Name[lt]": "KWin Aurorae",
"Name[nl]": "KWin Aurorae",
"Name[pl]": "KWin Aurorae",
"Name[sk]": "KWin Aurorae",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Demitrius Belai",
"Name[it]": "Demitrius Belai",
"Name[ko]": "Demitrius Belai",
"Name[lt]": "Demitrius Belai",
"Name[nl]": "Demitrius Belai",
"Name[pl]": "Demitrius Belai",
"Name[sk]": "Demitrius Belai",
@ -35,6 +36,7 @@
"Name[fr]": "Décorations pour KWin",
"Name[it]": "Decorazione di KWin",
"Name[ko]": "KWin 장식",
"Name[lt]": "KWin dekoracijos",
"Name[nl]": "KWin-decoraties",
"Name[pl]": "Wygląd KWin",
"Name[sk]": "KWin Dekorácia",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Vlad Zahorodnii",
"Name[it]": "Vlad Zahorodnii",
"Name[ko]": "Vlad Zahorodnii",
"Name[lt]": "Vlad Zahorodnii",
"Name[nl]": "Vlad Zahorodnii",
"Name[pl]": "Vlad Zahorodnii",
"Name[pt]": "Vlad Zahorodnii",
@ -36,6 +37,7 @@
"Name[fr]": "Effet pour KWin",
"Name[it]": "Effetto di KWin",
"Name[ko]": "KWin 효과",
"Name[lt]": "KWin efektas",
"Name[nl]": "KWin-effect",
"Name[pl]": "Efekt KWin",
"Name[sk]": "KWin Efekt",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
"Name[lt]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
@ -36,6 +37,7 @@
"Name[fr]": "Script pour KWin",
"Name[it]": "Script di KWin",
"Name[ko]": "KWin 스크립트",
"Name[lt]": "KWin scenarijus",
"Name[nl]": "KWin-script",
"Name[pl]": "Skrypt KWin",
"Name[sk]": "KWin Skript",

View file

@ -14,6 +14,7 @@
"Name[fr]": "Marco Martin",
"Name[it]": "Marco Martin",
"Name[ko]": "Marco Martin",
"Name[lt]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
@ -36,6 +37,7 @@
"Name[fr]": "Sélecteur de fenêtres de KWin",
"Name[it]": "Scambiafinestre di KWin",
"Name[ko]": "KWin 창 전환기",
"Name[lt]": "KWin langų perjungiklis",
"Name[nl]": "KWin-vensterwisselaar",
"Name[pl]": "Przełącznik okien KWin",
"Name[sk]": "KWin Prepínač okien",

View file

@ -18,7 +18,7 @@
"Description[id]": "Plugin platform untuk standalone x11 dalam kwin_x11.",
"Description[it]": "Estensione di piattaforma per x11 autonomo in kwin_x11.",
"Description[ko]": "kwin_x11의 단독 X11 플러그인입니다.",
"Description[lt]": "Platformos priedas, skirtas kwin_x11 viduje esančiam, atskiram x11",
"Description[lt]": "Platformos priedas, skirtas kwin_x11 viduje esančiam, atskiram x11.",
"Description[nl]": "Platform plug-in voor alleenstaande x11 in kwin_x11.",
"Description[nn]": "Plattformtillegg for frittståande X11 i kwin_x11.",
"Description[pl]": "Wtyczka platformy dla wolnostojącego x11 w kwin_x11.",