Commit bcdf113f authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 74b02cb1
......@@ -124,6 +124,7 @@ Keywords[ia]=program;software;repository;package;add;install;uninstall;remove;up
Keywords[it]=programma;software;deposito;pacchetto;installa;disinstalla;rimuovi;aggiorna;app;applicazioni;giochi;flatpak;snap;componenti aggiuntivi;firmware;
Keywords[ko]=program;software;repository;package;add;install;uninstall;remove;update;apps;applications;games;flatpak;snap;addons;add-ons;firmware;프로그램;소프트웨어;저장소;리포지토리;패키지;꾸러미;추가;설치;삭제;업데이트;앱;게임;추가 기능;부가 기능;펌웨어;
Keywords[nl]=programma;software;opslagruimte;pakket;toevoegen;installeren;installatie ongedaan maken;verwijderen;bijwerken;apps;toepassingen;applicaties;spellen;flatpak;snap;add-ons;firmware;
Keywords[nn]=program;programvare;pakkebrønn;pakke;pakkar;legg til;leggja til;installera;installering;avinstallera;avinstallering;fjerna;fjerning;oppdatera;oppdatering;app;appar;applikasjonar;spel;dataspel;flatpak;snap;tillegg;programtillegg;fastvare;
Keywords[pa]=ਪਰੋਗਰਾਮ;ਸਾਫਟਵੇਅਰ;ਰਿਪੋਜ਼ਟਰੀ;ਪੈਕੇਜ;ਇੰਸਟਾਲ;ਪ੍ਰੋਗਰਾਮ;ਇੰਸਟਾਲ;ਹਟਾਓ;ਮਿਟਾਓ;ਅੱਪਡੇਟ;ਐਪ;ਐਪਲੀਕੇਸ਼ਨਾਂ;ਅਣ-ਇੰਸਟਾਲ;ਖੇਡਾਂ;ਗੇਮਾਂ;ਫਲੈਟਪੈਕ;ਸਨੈਪ;ਐਡ-ਆਨ;ਐਡਆਨ;ਫਿਰਮਵੇਅਰ;ਫਰਮਵੇਅਰ;ਜੋੜੋ;
Keywords[pl]=program;oprogramowanie;repozytorium;archiwum;pakiet;paczka;dodaj;instaluj;zainstaluj;usuń;odinstaluj;uaktualnij;aktualizuj;programy;aplikacje;deb;gry;flatpak;snap;dodatki;oprogramowanie układowe;
Keywords[pt]=programa;software;repositório;pacote;instalar;remover;actualizar;aplicações;jogos;flatpak;snap;extensões;firmware;
......
......@@ -15,6 +15,7 @@
"Description[it]": "Configura il comportamento degli aggiornamenti software",
"Description[ko]": "소프트웨어 업데이트 행동 설정",
"Description[nl]": "Gedrag van software bijwerken configureren",
"Description[nn]": "Set opp handtering av programoppdateringar",
"Description[pa]": "ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਰਵੱਈਏ ਦੀ ਸੰਰਚਨਾ",
"Description[pl]": "Ustawienia zachowania uaktualnień oprogramowania",
"Description[pt_BR]": "Configurar o comportamento da atualização de aplicativos",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment