From 6c90a2c3a172f4d35dc2908ce3ba5caa46291bce Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Oct 2017 05:16:53 +0200 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" --- applets/appmenu/package/metadata.desktop | 1 + applets/calendar/package/metadata.desktop | 1 + wallpapers/color/metadata.desktop | 1 + wallpapers/image/slideshowpackage/metadata.desktop | 1 + 4 files changed, 4 insertions(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 6e42ac151..f1b4f0fbb 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -58,6 +58,7 @@ Comment[pa]=ਐਪਲੀਕੇਸ਼ਨ ਲੱਭਣ ਤੇ ਸ਼ੁਰੂ ਕ Comment[pl]=Klasyczne menu do znajdowania i uruchamiania aplikacji Comment[pt]=Menu clássico para descobrir e iniciar as aplicações Comment[pt_BR]=Menu clássico para encontrar e iniciar aplicativos +Comment[ru]=Классическое меню поиска и запуска приложений Comment[sk]=Klasická ponuka na hľadanie a spúšťanie aplikácií Comment[sl]=Klasični meni za iskanje in zaganjanje programov Comment[sr]=Класичан мени за налажење и покретање програма diff --git a/applets/calendar/package/metadata.desktop b/applets/calendar/package/metadata.desktop index 389faaeb7..1712fc987 100644 --- a/applets/calendar/package/metadata.desktop +++ b/applets/calendar/package/metadata.desktop @@ -97,6 +97,7 @@ Comment[nn]=Månadsvising med avtaler og hendingar Comment[pl]=Wyświetlanie miesiąca z twoimi spotkaniami i wydarzeniami Comment[pt]=Vista mensal com os seus compromissos e eventos Comment[pt_BR]=Exibição mensal com seus compromissos e eventos +Comment[ru]=Календарь на месяц с вашими запланированными делами и событиями Comment[sk]=Zobrazenie mesiaca s vašimi schôdzkami a udalosťami Comment[sl]=Mesečni prikaz z vašimi sestanki in dogodki Comment[sr]=Месечни приказ са вашим састанцима и догађајима diff --git a/wallpapers/color/metadata.desktop b/wallpapers/color/metadata.desktop index 98aa98ba8..16c5c9f11 100644 --- a/wallpapers/color/metadata.desktop +++ b/wallpapers/color/metadata.desktop @@ -63,6 +63,7 @@ Comment[pa]=ਇੱਕ ਰੰਗ ਦਾ ਵਾਲਪੇਪਰ Comment[pl]=Tapeta zwykłego koloru Comment[pt]=Papel de parede de cor simples Comment[pt_BR]=Papel de parede de cor simples +Comment[ru]=Простые одноцветные обои Comment[sk]=Tapeta obyčajná farba Comment[sr]=Проста боја као тапет Comment[sr@ijekavian]=Проста боја као тапет diff --git a/wallpapers/image/slideshowpackage/metadata.desktop b/wallpapers/image/slideshowpackage/metadata.desktop index 162a74b9b..f120579c9 100644 --- a/wallpapers/image/slideshowpackage/metadata.desktop +++ b/wallpapers/image/slideshowpackage/metadata.desktop @@ -90,6 +90,7 @@ Comment[pa]=ਸਲਾਈਡ-ਸ਼ੋ ਵਾਲਪੇਪਰ Comment[pl]=Tapeta pokazu slajdów Comment[pt]=Papel de parede da apresentação Comment[pt_BR]=Papel de parede com apresentação de slides +Comment[ru]=Слайд-шоу на месте обоев Comment[sk]=Tapeta prezentácia Comment[sr]=Слајд‑шоу као тапет Comment[sr@ijekavian]=Слајд‑шоу као тапет