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"
6 years ago · 964e73c39b
parent 54be487bba
commit 964e73c39b
12 changed files with 16 additions and 2 deletions
--- a/colors/BreezeDark.colors
+++ b/colors/BreezeDark.colors
@ -135,7 +135,7 @@ Name[pa]=ਬਰੀਜ਼ ਗੂੜ੍ਹਾ
 Name[pl]=Ciemna bryza
 Name[pt]=Brisa Escura
 Name[pt_BR]=Breeze Escuro
-Name[ro]=Briză Întunecat
+Name[ro]=Briză, întunecat
 Name[ru]=Breeze, тёмный вариант
 Name[sk]=Tmavý vánok
 Name[sl]=Sapica (temna)
--- a/colors/BreezeHighContrast.colors
+++ b/colors/BreezeHighContrast.colors
@ -131,6 +131,7 @@ Name[pa]=ਬਰੀਜ਼ ਵੱਧ ਕਨਟਰਾਸਟ
 Name[pl]=Wysoko-kontrastowa Bryza
 Name[pt]=Brisa de Alto Contraste
 Name[pt_BR]=Breeze Alto Contraste
+Name[ro]=Briză, contrast sporit
 Name[ru]=Breeze, высококонтрастный вариант
 Name[sk]=Vánok - vysoký kontrast
 Name[sl]=Sapica z visokim kontrastom
--- a/colors/BreezeLight.colors
+++ b/colors/BreezeLight.colors
@ -131,6 +131,7 @@ Name[pa]=ਬਰੀਜ਼ ਹਲਕਾ
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
+Name[ro]=Briză, luminos
 Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sl]=Sapica lahka
--- a/cursors/Breeze/Breeze/index.theme
+++ b/cursors/Breeze/Breeze/index.theme
@ -73,6 +73,7 @@ Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼
 Comment[pl]=Bryza autorstwa KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 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 Visual Design Group
--- a/cursors/Breeze/src/index.theme
+++ b/cursors/Breeze/src/index.theme
@ -73,6 +73,7 @@ Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼
 Comment[pl]=Bryza autorstwa KDE VDG
 Comment[pt]=Brisa da VDG do KDE
 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 Visual Design Group
--- a/cursors/Breeze_Snow/Breeze_Snow/index.theme
+++ b/cursors/Breeze_Snow/Breeze_Snow/index.theme
@ -26,6 +26,7 @@ Name[pa]=ਬਰੀਜ਼ ਹਲਕਾ
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
+Name[ro]=Briză, luminos
 Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sl]=Sapica lahka
@ -62,6 +63,7 @@ Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਹਲ
 Comment[pl]=Jasna Bryza autorstwa KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 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 Visual Design Group
--- a/cursors/Breeze_Snow/src/index.theme
+++ b/cursors/Breeze_Snow/src/index.theme
@ -26,6 +26,7 @@ Name[pa]=ਬਰੀਜ਼ ਹਲਕਾ
 Name[pl]=Jasna Bryza
 Name[pt]=Brisa Clara
 Name[pt_BR]=Breeze Claro
+Name[ro]=Briză, luminos
 Name[ru]=Breeze, светлый вариант
 Name[sk]=Svetlý vánok
 Name[sl]=Sapica lahka
@ -62,6 +63,7 @@ Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਹਲ
 Comment[pl]=Jasna Bryza autorstwa KDE VDG
 Comment[pt]=Brisa Claro da VDG do KDE
 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 Visual Design Group
--- a/kdecoration/breeze.json
+++ b/kdecoration/breeze.json
@ -30,6 +30,7 @@
        "Description[pl]": "Wystrój okien przy użyciu stylu wizualnego Bryzy dla Pulpitu Plazmy",
        "Description[pt]": "Decoração de janelas que usa o estilo visual Brisa para a Área de Trabalho Plasma",
        "Description[pt_BR]": "Decoração de janelas que usa o estilo visual Breeze para o Plasma Desktop",
+        "Description[ro]": "Decorații de fereastră folosind stilul vizual Briză pentru biroul Plasma",
        "Description[ru]": "Оформление окон Breeze",
        "Description[sk]": "Dekorácia okien pomocou vizuálneho štýlu Vánok pre plochu Plasma",
        "Description[sl]": "Okraski oken, ki uporabljajo vidni slog teme Sapica za namizje Plasma",
@ -76,6 +77,7 @@
        "Name[pl]": "Bryza",
        "Name[pt]": "Brisa",
        "Name[pt_BR]": "Breeze",
+        "Name[ro]": "Briză",
        "Name[ru]": "Breeze",
        "Name[sk]": "Vánok",
        "Name[sl]": "Sapica",
--- a/kdecoration/config/breezedecorationconfig.desktop
+++ b/kdecoration/config/breezedecorationconfig.desktop
@ -36,6 +36,7 @@ Name[pa]=ਬਰੀਜ਼ ਵਿੰਡੋ ਸਜਾਵਟ
 Name[pl]=Wygląd okien Bryzy
 Name[pt]=Decoração de Janelas Brisa
 Name[pt_BR]=Decorações da janela Breeze
+Name[ro]=Decorații pentru ferestre Briză
 Name[ru]=Оформление окон Breeze
 Name[sk]=Dekorácie okien Breeze
 Name[sl]=Okraski oken Sapica
--- a/kstyle/config/breezestyleconfig.desktop
+++ b/kstyle/config/breezestyleconfig.desktop
@ -36,6 +36,7 @@ Name[pa]=ਬਰੀਜ਼ ਵਿਜੈਟ ਸਟਾਈਲ
 Name[pl]=Wygląd interfejsu Bryzy
 Name[pt]=Estilo Gráfico Brisa
 Name[pt_BR]=Estilo dos widgets Breeze
+Name[ro]=Stilul controalelor Briză
 Name[ru]=Стиль интерфейса Breeze
 Name[sk]=Štýl prvkov Breeze
 Name[sl]=Slog gradnikov Sapica
--- a/lookandfeel.dark/metadata.desktop
+++ b/lookandfeel.dark/metadata.desktop
@ -26,6 +26,7 @@ Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਗੂ
 Comment[pl]=Ciemna bryza autorstwa KDE VDG
 Comment[pt]=Brisa Escuro da VDG do KDE
 Comment[pt_BR]=Breeze Dark pelo KDE VDG
+Comment[ro]=Briză, întunecat, de KDE VDG
 Comment[ru]=Тёмный вариант Breeze от KDE VDG
 Comment[sk]=Tmavý vánok od KDE VDG
 Comment[sl]=Sapica temna s strani KDE VDG
@ -66,7 +67,7 @@ Name[pa]=ਬਰੀਜ਼ ਗੂੜ੍ਹਾ
 Name[pl]=Ciemna bryza
 Name[pt]=Brisa Escura
 Name[pt_BR]=Breeze Escuro
-Name[ro]=Briză Întunecat
+Name[ro]=Briză, întunecat
 Name[ru]=Breeze, тёмный вариант
 Name[sk]=Tmavý vánok
 Name[sl]=Sapica (temna)
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -18,6 +18,7 @@ Name[nl]=Flow
 Name[nn]=Flyt
 Name[pt]=Fluxo
 Name[pt_BR]=Flow
+Name[ro]=Flux
 Name[ru]=Поток
 Name[sk]=Prúd
 Name[sl]=Tok