yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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"
This commit is contained in:
l10n daemon script 2021-01-17 06:42:32 +01:00
parent 907480037a
commit 59b1dee55a
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwintabbox/kwintabbox.desktop
View file

@ -49,7 +49,7 @@ Name[nds]=Twischen Opgaven wesseln
Name[nl]=Taakschakelaar
Name[nn]=Oppgåvevekslar
Name[pa]=ਟਾਸਕ ਸਵਿੱਚਰ
Name[pl]=Przełączanie zadań
Name[pl]=Przełącznik zadań
Name[pt]=Mudança de Tarefas
Name[pt_BR]=Mudança de tarefas
Name[ro]=Comutator de sarcini

2
plugins/krunner-integration/kwin-runner-windows.desktop
View file

@ -13,6 +13,7 @@ Name[it]=Finestre
Name[lt]=Langai
Name[nl]=Vensters
Name[nn]=Vindauge
Name[pl]=Okna
Name[pt]=Janelas
Name[pt_BR]=Janelas
Name[ru]=Окна
@ -35,6 +36,7 @@ Comment[it]=Elenca e scambia le finestre ed i desktop
Comment[lt]=Išvardyti langus ir darbalaukius bei perjungti į juos
Comment[nl]=Toon vensters en bureaubladen en schakel ze om
Comment[nn]=Vis vindauge og skrivebord, og byt mellom dei
Comment[pl]=Wypisuje okna i pulpity oraz przełącza pomiędzy nimi
Comment[pt]=Listar as janelas e ecrãs e mudar entre elas
Comment[pt_BR]=Lista as janelas e áreas de trabalho e alterna entre elas
Comment[sk]=Zobraziť okná a plochy a prepnúť ich