From 28d56ef0d0da45f155e8b18137c61727e4b857ad Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 29 Aug 2016 11:48:37 +0000 Subject: [PATCH] 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" --- kcmkwin/kwindecoration/kwindecoration.desktop | 2 +- kcmkwin/kwindesktop/desktop.desktop | 2 +- tabbox/kwindesktopswitcher.desktop | 2 +- tabbox/kwinwindowswitcher.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.desktop b/kcmkwin/kwindecoration/kwindecoration.desktop index e9d01bcec1..e84c96f2af 100644 --- a/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kcmkwin/kwindecoration/kwindecoration.desktop @@ -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 diff --git a/kcmkwin/kwindesktop/desktop.desktop b/kcmkwin/kwindesktop/desktop.desktop index 67da54a732..9cf00d7413 100644 --- a/kcmkwin/kwindesktop/desktop.desktop +++ b/kcmkwin/kwindesktop/desktop.desktop @@ -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 diff --git a/tabbox/kwindesktopswitcher.desktop b/tabbox/kwindesktopswitcher.desktop index d418b6d2fc..37b4528147 100644 --- a/tabbox/kwindesktopswitcher.desktop +++ b/tabbox/kwindesktopswitcher.desktop @@ -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 diff --git a/tabbox/kwinwindowswitcher.desktop b/tabbox/kwinwindowswitcher.desktop index 01bcc9f066..cfd4c394cf 100644 --- a/tabbox/kwinwindowswitcher.desktop +++ b/tabbox/kwinwindowswitcher.desktop @@ -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