Commit b74a20f6 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 c831bd97
......@@ -16,6 +16,7 @@ Name[ca]=Pantalla de presentació d'inici
Name[cs]=Úvodní startovací obrazovka
Name[da]=Opstartsbillede under boot
Name[de]=Systemstartbildschirm
Name[el]=Αρχική οθόνη εκκίνησης Plymouth
Name[en_GB]=Boot Splash Screen
Name[es]=Pantalla de arranque
Name[et]=Algkäivitusekraan
......@@ -48,6 +49,7 @@ Comment[ca]=Pantalla de presentació d'inici del Plymouth
Comment[cs]=Vyberte úvodní startovací obrazovku Plymouth
Comment[da]=Vælg Plymouth boot-opstartsskærm
Comment[de]=Systemstartbildschirm auswählen
Comment[el]=Επιλέξτε την αρχική οθόνη εκκίνησης του Plymouth
Comment[en_GB]=Choose Plymouth boot splash screen
Comment[es]=Escoger la pantalla de arranque de Plymouth
Comment[et]=Vali Plymouthi alglaadimisekraan
......@@ -80,6 +82,7 @@ X-KDE-Keywords[ca]=plymouth,splash,pantalla de presentació,presentació d'inici
X-KDE-Keywords[cs]=plymouth,úvod,úvodní obrazovka,startovací obrazovka
X-KDE-Keywords[da]=plymouth,splash,opstartsskærm,boot splash
X-KDE-Keywords[de]=plymouth,splash,splash screen,Startbildschirm,Systemstart
X-KDE-Keywords[el]=plymouth,αρχική,αρχική οθόνη,οθόνη εκκίνησης
X-KDE-Keywords[en_GB]=plymouth,splash,splash screen,boot splash
X-KDE-Keywords[es]=plymouth,pantalla de bienvenida,pantalla de arranque
X-KDE-Keywords[et]=plymouth,alglaadimine,tiitelkuva
......@@ -95,6 +98,7 @@ X-KDE-Keywords[ko]=plymouth,splash,splash screen,시작 화면,부팅,부팅 화
X-KDE-Keywords[lt]=plymouth,prisistatymas,prisistatymo,ekranas,langas,paleidimo,os
X-KDE-Keywords[nl]=plymouth,opstartscherm,boot splash
X-KDE-Keywords[nn]=plymouth,oppstartsbilete,velkomstbilete,splash screen,boot
X-KDE-Keywords[pa]=ਪਲੇਮਾਊਥ;ਸਪਲੈਸ਼;ਸਪਲੈਸ਼ ਸਕਰੀਨ,ਬੂਟ ਸਕਰੀਨ
X-KDE-Keywords[pl]=plymouth,ekran powitalny,powitalny,uruchamianie
X-KDE-Keywords[pt]=plymouth,inicial,ecrã inicial,ecrã de arranque
X-KDE-Keywords[pt_BR]=plymouth,splash,tela de inicialização,tela de boot
......
Markdown is supported
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