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 2016-08-29 11:48:37 +00:00
parent ab459fb126
commit 28d56ef0d0
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -145,7 +145,7 @@ X-KDE-Keywords[nl]=kwin,venster,beheerder,grens,stijl,thema,look,feel,indeling,k
X-KDE-Keywords[nn]=kwin,vindauge,handsamar,ramme,kantlinje,stil,tema,lås,utforming,knapp,handtak,kant,kwm,dekorasjon,pynt
X-KDE-Keywords[pl]=kwin,okno,menadżer,obramowanie,styl,motyw,wygląd,odczucie,układ,przycisk, uchwyt,krawędź,kwm,dekoracja
X-KDE-Keywords[pt]=kwin,gestor,janela,contorno,estilo,tema,aparência,comportamento,disposição,botão,pega,extremo,kwm,decoração
X-KDE-Keywords[pt_BR]=kwin,gerenciador,janela,borda,estilo,tema,aparência,comportamento,leiaute,botão,canto,extremo,kwm,decoração
X-KDE-Keywords[pt_BR]=kwin,gerenciador,janela,borda,estilo,tema,aparência,comportamento,layout,botão,canto,extremo,kwm,decoração
X-KDE-Keywords[ru]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,окно,диспетчер,граница,стиль,тема,внешний вид,оформление,разметка,шаблон,кнопка,управление,край
X-KDE-Keywords[sk]=kwin,okno,správca,rám,štýl,téma,vzhľad,cítenie,rozloženie,tlačidlo,spracovanie,okraj,kwm,dekorácia
X-KDE-Keywords[sl]=kwin,okna,okenski upravljalnik,upravljalnik oken,rob,obroba,slog,tema,videz,obnašanje,občutek,razpored,gumbi,ročica,okraski,kwm

2
kcmkwin/kwindesktop/desktop.desktop
View file

@ -102,7 +102,7 @@ Comment[nl]=Navigatie door, aantal en indeling van virtuele bureaubladen
Comment[nn]=Navigering, nummer og vising av virtuelle skrivebord
Comment[pl]=Poruszanie się, liczba i układ wirtualnych pulpitów
Comment[pt]=Navegação, Número e Disposição dos Ecrãs Virtuais
Comment[pt_BR]=Navegação, quantidade e leiaute das áreas de trabalho virtuais
Comment[pt_BR]=Navegação, quantidade e layout das áreas de trabalho virtuais
Comment[ru]=Число, расположение и способ переключения рабочих столов
Comment[sk]=Navigácia, počet a rozloženie virtuálnych plôch
Comment[sl]=Krmarjenje med, število in razporeditev navideznih namizij

2
tabbox/kwindesktopswitcher.desktop
View file

@ -32,7 +32,7 @@ Comment[nn]=Utforming for KWin-skrivebordsbytar
Comment[pa]=KWin ਡੈਸਕਟਾਪ ਸਵਿੱਚਰ ਲੇਆਉਟ
Comment[pl]=Układ przełączania pulpitów KWin
Comment[pt]=Disposição da Mudança de Ecrãs do KWin
Comment[pt_BR]=Leiaute do seletor de área de trabalho do KWin
Comment[pt_BR]=Layout do seletor de área de trabalho do KWin
Comment[ru]=Переключатель рабочих столов для KWin
Comment[sk]=Rozloženie prepínača okien KWin
Comment[sl]=Razpored preklapljanja med namizji

2
tabbox/kwinwindowswitcher.desktop
View file

@ -34,7 +34,7 @@ Comment[nn]=Utforming for KWin-vindaugsbytar
Comment[pa]=KWin ਵਿੰਡੋ ਸਵਿੱਚਰ ਲੇਆਉਟ
Comment[pl]=Układ przełączania okien KWin
Comment[pt]=Disposição da Mudança de Janelas do KWin
Comment[pt_BR]=Leiaute do seletor de janelas do KWin
Comment[pt_BR]=Layout do seletor de janelas do KWin
Comment[ru]=Переключатель окон для KWin
Comment[sk]=Rozloženie prepínača okien KWin
Comment[sl]=Razpored preklapljanja med okni