From e057c7b354995df42d13d84dd7367cd1e24eacb3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 Jan 2022 01:40:14 +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" --- colors/BreezeClassic.colors | 2 +- colors/BreezeDark.colors | 2 +- colors/BreezeLight.colors | 2 +- cursors/Breeze/Breeze/index.theme | 2 +- cursors/Breeze/src/index.theme | 2 +- cursors/Breeze_Snow/Breeze_Snow/index.theme | 4 ++-- cursors/Breeze_Snow/src/index.theme | 4 ++-- kdecoration/config/breezedecorationconfig.desktop | 6 +++--- kstyle/config/breezestyleconfig.desktop | 2 +- wallpapers/Next/metadata.desktop | 3 +++ 10 files changed, 16 insertions(+), 13 deletions(-) diff --git a/colors/BreezeClassic.colors b/colors/BreezeClassic.colors index a03d73d0..c66e4a8c 100644 --- a/colors/BreezeClassic.colors +++ b/colors/BreezeClassic.colors @@ -128,7 +128,7 @@ Name[pl]=Klasyczna Bryza Name[pt]=Brisa Clássica Name[pt_BR]=Breeze Classic Name[sk]=Klasický vánok -Name[sl]=Sapica klasična +Name[sl]=Sapica, klasična Name[sv]=Breeze klassisk Name[uk]=Класична Breeze Name[x-test]=xxBreeze Classicxx diff --git a/colors/BreezeDark.colors b/colors/BreezeDark.colors index 024d0853..c66e52c1 100644 --- a/colors/BreezeDark.colors +++ b/colors/BreezeDark.colors @@ -168,7 +168,7 @@ Name[pt_BR]=Breeze Dark Name[ro]=Briză, întunecat Name[ru]=Breeze, тёмный вариант Name[sk]=Tmavý vánok -Name[sl]=Sapica temna +Name[sl]=Sapica, temna Name[sr]=Поветарац тамни Name[sr@ijekavian]=Поветарац тамни Name[sr@ijekavianlatin]=Povetarac tamni diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors index 82dd61da..d7a6ad6f 100644 --- a/colors/BreezeLight.colors +++ b/colors/BreezeLight.colors @@ -165,7 +165,7 @@ Name[pt_BR]=Breeze Light Name[ro]=Briză, luminos Name[ru]=Breeze, светлый вариант Name[sk]=Svetlý vánok -Name[sl]=Sapica lahka +Name[sl]=Sapica, svetla Name[sv]=Breeze ljus Name[tg]=Насими сабук Name[uk]=Світла Breeze diff --git a/cursors/Breeze/Breeze/index.theme b/cursors/Breeze/Breeze/index.theme index 7c299a38..d0c199d2 100644 --- a/cursors/Breeze/Breeze/index.theme +++ b/cursors/Breeze/Breeze/index.theme @@ -81,7 +81,7 @@ Comment[pt_BR]=Breeze pelo KDE VDG Comment[ro]=Briză, de KDE VDG Comment[ru]=Breeze от KDE VDG Comment[sk]=Vánok od KDE VDG -Comment[sl]=Sapica s strani KDE VDG +Comment[sl]=Sapica; izdelali pri KDE VDG Comment[sv]=Breeze av KDE:s visuella designgrupp Comment[tg]=Насим аз KDE VDG Comment[uk]=Breeze, автори — KDE VDG diff --git a/cursors/Breeze/src/index.theme b/cursors/Breeze/src/index.theme index 7c299a38..d0c199d2 100644 --- a/cursors/Breeze/src/index.theme +++ b/cursors/Breeze/src/index.theme @@ -81,7 +81,7 @@ Comment[pt_BR]=Breeze pelo KDE VDG Comment[ro]=Briză, de KDE VDG Comment[ru]=Breeze от KDE VDG Comment[sk]=Vánok od KDE VDG -Comment[sl]=Sapica s strani KDE VDG +Comment[sl]=Sapica; izdelali pri KDE VDG Comment[sv]=Breeze av KDE:s visuella designgrupp Comment[tg]=Насим аз KDE VDG Comment[uk]=Breeze, автори — KDE VDG diff --git a/cursors/Breeze_Snow/Breeze_Snow/index.theme b/cursors/Breeze_Snow/Breeze_Snow/index.theme index 5acb9251..e87810e9 100644 --- a/cursors/Breeze_Snow/Breeze_Snow/index.theme +++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme @@ -32,7 +32,7 @@ Name[pt_BR]=Breeze Light Name[ro]=Briză, luminos Name[ru]=Breeze, светлый вариант Name[sk]=Svetlý vánok -Name[sl]=Sapica lahka +Name[sl]=Sapica, svetla Name[sv]=Breeze ljus Name[tg]=Насими сабук Name[uk]=Світла Breeze @@ -72,7 +72,7 @@ Comment[pt_BR]=Breeze Light pelo KDE VDG Comment[ro]=Briză, luminos, de KDE VDG Comment[ru]=Светлый вариант Breeze от KDE VDG Comment[sk]=Svetlý vánok od KDE VDG -Comment[sl]=Sapica lahka s strani KDE VDG +Comment[sl]=Sapica, svetla; izdelali pri KDE VDG Comment[sv]=Breeze ljus av KDE:s visuella designgrupp Comment[tg]=Насими сабук аз KDE VDG Comment[uk]=Світла Breeze, автори — KDE VDG diff --git a/cursors/Breeze_Snow/src/index.theme b/cursors/Breeze_Snow/src/index.theme index 5acb9251..e87810e9 100644 --- a/cursors/Breeze_Snow/src/index.theme +++ b/cursors/Breeze_Snow/src/index.theme @@ -32,7 +32,7 @@ Name[pt_BR]=Breeze Light Name[ro]=Briză, luminos Name[ru]=Breeze, светлый вариант Name[sk]=Svetlý vánok -Name[sl]=Sapica lahka +Name[sl]=Sapica, svetla Name[sv]=Breeze ljus Name[tg]=Насими сабук Name[uk]=Світла Breeze @@ -72,7 +72,7 @@ Comment[pt_BR]=Breeze Light pelo KDE VDG Comment[ro]=Briză, luminos, de KDE VDG Comment[ru]=Светлый вариант Breeze от KDE VDG Comment[sk]=Svetlý vánok od KDE VDG -Comment[sl]=Sapica lahka s strani KDE VDG +Comment[sl]=Sapica, svetla; izdelali pri KDE VDG Comment[sv]=Breeze ljus av KDE:s visuella designgrupp Comment[tg]=Насими сабук аз KDE VDG Comment[uk]=Світла Breeze, автори — KDE VDG diff --git a/kdecoration/config/breezedecorationconfig.desktop b/kdecoration/config/breezedecorationconfig.desktop index e7ec785e..810ad105 100644 --- a/kdecoration/config/breezedecorationconfig.desktop +++ b/kdecoration/config/breezedecorationconfig.desktop @@ -41,7 +41,7 @@ Name[pt_BR]=Decorações da janela Breeze Name[ro]=Decorații pentru ferestre Briză Name[ru]=Оформление окон Breeze Name[sk]=Dekorácie okien v štýle Vánok -Name[sl]=Okraski oken Sapica +Name[sl]=Okrasitev oken Sapica Name[sr]=Поветарчева декорација прозора Name[sr@ijekavian]=Поветарчева декорација прозора Name[sr@ijekavianlatin]=Povetarčeva dekoracija prozora @@ -88,7 +88,7 @@ Comment[pt_BR]=Modifica a aparência das decorações da janela Comment[ro]=Modifică aspectul decorațiilor pentru ferestre Comment[ru]=Настройка заголовков окон в стиле Breeze Comment[sk]=Zmena vzhľadu dekorácie okien -Comment[sl]=Spremenite videz okraskov oken +Comment[sl]=Spremenite videz okrasitve oken Comment[sr]=Измените изглед декорација прозора Comment[sr@ijekavian]=Измијените изглед декорација прозора Comment[sr@ijekavianlatin]=Izmijenite izgled dekoracija prozora @@ -135,7 +135,7 @@ X-KDE-Keywords[pt_BR]=breeze,decoração X-KDE-Keywords[ro]=briză,breeze,decorare,decorație X-KDE-Keywords[ru]=breeze,бриз,decoration,декорации окон,оформление окон X-KDE-Keywords[sk]=vánok,dekorácia -X-KDE-Keywords[sl]=sapica,okraski +X-KDE-Keywords[sl]=sapica,okraski,okrasitev,breeze X-KDE-Keywords[sr]=breeze,decoration,Поветарац,декорација X-KDE-Keywords[sr@ijekavian]=breeze,decoration,Поветарац,декорација X-KDE-Keywords[sr@ijekavianlatin]=breeze,decoration,Povetarac,dekoracija diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index c2f1bdf2..e3acd22b 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -135,7 +135,7 @@ X-KDE-Keywords[pt_BR]=breeze,widget,estilo X-KDE-Keywords[ro]=briză,breeze,widget,stil X-KDE-Keywords[ru]=breeze,widget,style,бриз,элемент интерфейса,виджет,внешний вид,визуальное представление,стиль,тема,оформление X-KDE-Keywords[sk]=vánok,widget,štýl,breeze,miniaplikácia -X-KDE-Keywords[sl]=sapica,gradnik,slog +X-KDE-Keywords[sl]=sapica,gradnik,slog,breeze X-KDE-Keywords[sr]=breeze,widget,style,Поветарац,виџет,стил X-KDE-Keywords[sr@ijekavian]=breeze,widget,style,Поветарац,виџет,стил X-KDE-Keywords[sr@ijekavianlatin]=breeze,widget,style,Povetarac,vidžet,stil diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 2f72902a..d8f2871a 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -1,10 +1,13 @@ [Desktop Entry] Name=Honeywave +Name[az]=Bal dalğası Name[ca]=Honeywave +Name[es]=Onda de miel Name[fr]=Onde de miel Name[ia]=Honeywave Name[nl]=Honeywave Name[pl]=Fala miodu +Name[sl]=Medeni pljusk Name[sv]=Honungsvåg Name[uk]=Медова хвиля Name[x-test]=xxHoneywavexx