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"
This commit is contained in:
l10n daemon script 2022-11-20 01:50:06 +00:00
parent af535bac3f
commit 1fec8612dc
23 changed files with 34 additions and 0 deletions

View file

@ -18,6 +18,7 @@
"Name[it]": "Marco Martin",
"Name[ka]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pa]": "ਮਾਰਕੋ ਮਾਰਟਿਨ",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin",
@ -42,6 +43,7 @@
"Description[it]": "Schermata home mobile con particolare attenzione alla personalizzazione.",
"Description[ka]": "მობილური საწყისი ეკრანი მორგებადობაზე ფოკუსით.",
"Description[nl]": "Een startscherm voor een mobiel gericht op aanpasbaarheid.",
"Description[pa]": "ਮੋਬਾਈਲ ਮੁੱਖ-ਸਕਰੀਨ, ਜੋ ਕਿ ਮਨ ਮੁਤਾਬਕ ਢਾਲਣ ਉੱਤੇ ਕੇਂਦਰਿਤ ਹੈ।",
"Description[pl]": "Przenośny ekran domowy z naciskiem na dostosowywanie.",
"Description[pt]": "Ecrã inicial móvel com um foco na personalização.",
"Description[ru]": "Начальный экран для мобильных устройств с акцентом на возможностях настройки.",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -18,6 +18,7 @@
"Name[it]": "Marco Martin",
"Name[ka]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pa]": "ਮਾਰਕੋ ਮਾਰਟਿਨ",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin",
@ -42,6 +43,7 @@
"Description[it]": "Pannello superiore per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის ზედა პანელი",
"Description[nl]": "Hoofdpaneel voor Plasma-mobiel",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਸਿਖਰਲਾ ਪੈਨਲ",
"Description[pl]": "Górny panel dla Przenośnej Plazmy",
"Description[pt]": "Painel de topo do Plasma Mobile",
"Description[ru]": "Верхняя панель Plasma Mobile",

View file

@ -18,6 +18,7 @@
"Name[it]": "Marco Martin",
"Name[ka]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[pa]": "ਮਾਰਕੋ ਮਾਰਟਿਨ",
"Name[pl]": "Marco Martin",
"Name[pt]": "Marco Martin",
"Name[pt_BR]": "Marco Martin",
@ -42,6 +43,7 @@
"Description[it]": "Pannello di navigazione per Plasma Mobile",
"Description[ka]": "Plasma Mobile-ის ნავიგაციის პანელი",
"Description[nl]": "Navigatiepaneel voor Plasma-mobiel",
"Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਨੇਵੀਗੇਸ਼ਨ ਪੈਨਲ",
"Description[pl]": "Panel poruszania się dla Przenośnej Plazmy",
"Description[pt]": "Painel de navegação do Plasma Mobile",
"Description[ru]": "Панель навигации Plasma Mobile",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
@ -43,6 +44,7 @@
"Description[it]": "Configura la shell di sistema",
"Description[ka]": "სისტემური გარსის მორგება",
"Description[nl]": "De systeem-shell configureren",
"Description[pa]": "ਸਿਸਟਮ ਸ਼ੈੱਲ ਦੀ ਸੰਰਚਨਾ",
"Description[pl]": "Ustawienia powłoki systemowej",
"Description[pt]": "Configurar a consola do sistema",
"Description[pt_BR]": "Configurar o shell do sistema",

View file

@ -18,6 +18,7 @@
"Name[it]": "Bhushan Shah",
"Name[ka]": "Bhushan Shah",
"Name[nl]": "Bhushan Shah",
"Name[pa]": "ਭੂਸ਼ਨ ਸ਼ਾਹ",
"Name[pl]": "Bhushan Shah",
"Name[pt]": "Bhushan Shah",
"Name[pt_BR]": "Bhushan Shah",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
@ -40,6 +41,7 @@
"Description[it]": "Impostazione rapida per la sospensione del sistema",
"Description[ka]": "სისტემის ძილის შეწყვეტის სწრაფ მორგება",
"Description[nl]": "Snelle instelling systeemslaap te onderbreken",
"Description[pa]": "ਸਿਸਟਮ ਸਲੀਪ ਨੂੰ ਸਸਪੈਂਡ ਕਰਨ ਲਈ ਫੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienie do usypiania",
"Description[pt]": "Configuração rápida para interromper a suspensão do sistema",
"Description[ru]": "Быстрая настройка приостановки системного сна",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
@ -40,6 +41,7 @@
"Description[it]": "Impostazione rapida per commutare la modalità Non disturbare",
"Description[ka]": "სისტემის ძილის შეწყვეტის სწრაფი მორგება",
"Description[nl]": "Snelle instelling om modus niet storen om te schakelen",
"Description[pa]": "ਤੰਗ ਨਾ ਕਰੋ ਮੋਡ ਨੂੰ ਬਦਲਣ ਲਈ ਫੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienie do przełączania trybu nie-przeszkadzać",
"Description[pt]": "Configuração rápida para activar/desactivar o modo 'não incomodar'",
"Description[ru]": "Быстрое включение или отключение режима «не беспокоить»",
@ -62,6 +64,7 @@
"Name[it]": "Non disturbare",
"Name[ka]": "არ შემაწუხო",
"Name[nl]": "Niet storen",
"Name[pa]": "ਤੰਗ ਨਾ ਕਰੋ",
"Name[pl]": "Nie przeszkadzać",
"Name[pt]": "Não Incomodar",
"Name[pt_BR]": "Não perturbe",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
@ -40,6 +41,7 @@
"Description[it]": "Impostazione rapida per la commutazione della tastiera",
"Description[ka]": "პარამეტრების აპლიკაციის სწრაფი მორგება",
"Description[nl]": "Snelle instelling voor omschakelen van toetsenbord",
"Description[pa]": "ਕੀਬੋਰਡ ਬਦਲਣ ਲਈ ਫੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienie przełącznika klawiatury",
"Description[pt]": "Configuração rápida da comutação do teclado",
"Description[ru]": "Быстрое включение или отключение виртуальной клавиатуры",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -18,6 +18,7 @@
"Name[it]": "Aleix Pol",
"Name[ka]": "ალის პოლი",
"Name[nl]": "Aleix Pol",
"Name[pa]": "ਐਲਿਕਸ ਪੋਲ",
"Name[pl]": "Aleix Pol",
"Name[pt]": "Aleix Pol",
"Name[pt_BR]": "Aleix Pol",
@ -41,6 +42,7 @@
"Description[it]": "Impostazione rapida del colore notturno",
"Description[ka]": "ღამის ფერების სწრაფი მორგება",
"Description[nl]": "Snelle instelling voor nachtkleur",
"Description[pa]": "ਰਾਤ ਦੇ ਰੰਗ ਫੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienia barw nocnych",
"Description[pt]": "Configuração rápida da cor nocturna",
"Description[ru]": "Быстрая настройка ночной цветовой схемы",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
@ -40,6 +41,7 @@
"Description[it]": "Impostazione rapida del menu di alimentazione",
"Description[ka]": "კვების მენიუს სწრაფი მორგება",
"Description[nl]": "Snelle instelling energiemenu",
"Description[pa]": "ਪਾਵਰ ਮੇਨੂ ਫੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienie menu rozbudowanego",
"Description[pt]": "Configuração rápida do menu de energia",
"Description[ru]": "Быстрая настройка меню питания",

View file

@ -40,6 +40,7 @@
"Description[it]": "Impostazioni rapide di registrazione dello schermo",
"Description[ka]": "ეკრანის ჩაწერის სწრაფი მორგება",
"Description[nl]": "Snelle instelling van scherm opnemen",
"Description[pa]": "ਸਕਰੀਨ ਰਿਕਾਰਡਿੰਗ ਫ਼ੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienia nagrywania ekranu",
"Description[pt]": "Configuração rápida da gravação do ecrã",
"Description[ru]": "Быстрая настройка записи экрана",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",
@ -42,6 +43,7 @@
"Description[ka]": "ეკრანის ტრიალის სწრაფი მორგება",
"Description[ko]": "화면 회전 빠른 설정",
"Description[nl]": "Snelle instelling van schermrotatie",
"Description[pa]": "ਸਕਰੀਨ ਘੁੰਮਾਉਣ ਫ਼ੌਰੀ ਸੈਟਿੰਗ",
"Description[pl]": "Szybkie ustawienie obracania ekranu",
"Description[pt]": "Configuração rápida da rotação do ecrã",
"Description[pt_BR]": "Configurações rápidas de rotação da tela",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -17,6 +17,7 @@
"Name[it]": "Devin Lin",
"Name[ka]": "Devin Lin",
"Name[nl]": "Devin Lin",
"Name[pa]": "ਡੇਵਿਨ ਲਿਨ",
"Name[pl]": "Devin Lin",
"Name[pt]": "Devin Lin",
"Name[pt_BR]": "Devin Lin",

View file

@ -45,6 +45,7 @@
"Description[it]": "Shell di Plasma per telefoni",
"Description[ka]": "Plasma გარსი ტელეფონისთვის",
"Description[nl]": "Plasma-shell voor telefoons",
"Description[pa]": "ਫ਼ੋਨਾਂ ਲਈ ਪਲਾਜ਼ਮਾ ਸ਼ੈਲ",
"Description[pl]": "Powłoka Plazmy dla telefonów",
"Description[pt]": "Consola do Plasma para telemóveis",
"Description[pt_BR]": "Plasma Shell para celulares",