Commit 50f56550 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 5d62445d
...@@ -19,7 +19,7 @@ Name[fr]=Gestionnaire de tâches par icônes ...@@ -19,7 +19,7 @@ Name[fr]=Gestionnaire de tâches par icônes
Name[gl]=Xestor de tarefas de só iconas Name[gl]=Xestor de tarefas de só iconas
Name[he]=מנהל משימות של סמלים בלבד Name[he]=מנהל משימות של סמלים בלבד
Name[hu]=Ikonos feladatkezelő Name[hu]=Ikonos feladatkezelő
Name[ia]=Gerente de carga a sole icone Name[ia]=Gerente de carga a sol icone
Name[id]=Task Manager Hanya Ikon Name[id]=Task Manager Hanya Ikon
Name[is]=Verkefnastjóri einungis með táknmyndum Name[is]=Verkefnastjóri einungis með táknmyndum
Name[it]=Gestore dei processi solo icone Name[it]=Gestore dei processi solo icone
......
[Desktop Entry] [Desktop Entry]
Name=Margins Separator Name=Margins Separator
Name[ca]=Separador de marges
Name[es]=Separador de márgenes
Name[nn]=Margskiljar
Name[pt]=Separador de Margens
Name[sv]=Marginalavdelare
Name[uk]=Роздільник полів
Name[x-test]=xxMargins Separatorxx
Comment=To be used as a separator between margin areas in themes that support them Comment=To be used as a separator between margin areas in themes that support them
Comment[ca]=S'usarà com a separador entre les àrees de marge en els temes que els permeten
Comment[es]=A usar como separador entre áreas de margen en los temas que lo permitan
Comment[nn]=Skal brukast som skilje mellom margområde i tema som støttar dei
Comment[pt]=A usar como separador entre áreas de margens nos temas com suporte para elas
Comment[sv]=Att använda som en avdelare mellan marginalområden i teman som stöder dem
Comment[uk]=Буде використано як роздільник між областями полів у темах, де передбачено підтримку таких роздільників
Comment[x-test]=xxTo be used as a separator between margin areas in themes that support themxx
Encoding=UTF-8 Encoding=UTF-8
Icon=filename-divider Icon=filename-divider
Keywords=separator Keywords=separator
Keywords[ca]=separador
Keywords[es]=separador
Keywords[ia]=separator
Keywords[nn]=skiljar
Keywords[pt]=separador
Keywords[sv]=avdelare
Keywords[uk]=separator;роздільник;
Keywords[x-test]=xxseparatorxx
Type=Service Type=Service
X-Plasma-API=declarativeappletscript X-Plasma-API=declarativeappletscript
......
...@@ -123,6 +123,7 @@ X-KDE-Keywords[fi]=ksmserver,istunto,uloskirjautuminen,kirjaudu,ulos,vahvistus,v ...@@ -123,6 +123,7 @@ X-KDE-Keywords[fi]=ksmserver,istunto,uloskirjautuminen,kirjaudu,ulos,vahvistus,v
X-KDE-Keywords[fr]=ksmserver, session, déconnexion, confirmation, enregistrer, restaurer,efi,uefi,bios X-KDE-Keywords[fr]=ksmserver, session, déconnexion, confirmation, enregistrer, restaurer,efi,uefi,bios
X-KDE-Keywords[gl]=ksmserver,sesión,saír,confirmación,gardar,restaurar,efi,uefi,bios X-KDE-Keywords[gl]=ksmserver,sesión,saír,confirmación,gardar,restaurar,efi,uefi,bios
X-KDE-Keywords[hu]=ksmserver,munkamenet,kijelentkezés,megerősítés,mentés,visszaállítás,efi,uefi,bios X-KDE-Keywords[hu]=ksmserver,munkamenet,kijelentkezés,megerősítés,mentés,visszaállítás,efi,uefi,bios
X-KDE-Keywords[ia]=ksmserver,session,logout,confirmation,save,restore,efi,uefi,bios
X-KDE-Keywords[id]=ksmserver,sesi,,logout,keluar,konfirmasi,simpan,pulihkan,efi,uefi,bios X-KDE-Keywords[id]=ksmserver,sesi,,logout,keluar,konfirmasi,simpan,pulihkan,efi,uefi,bios
X-KDE-Keywords[it]=ksmserver,sessione,uscita,conferma,salva,ripristina,efi,uefi,bios X-KDE-Keywords[it]=ksmserver,sessione,uscita,conferma,salva,ripristina,efi,uefi,bios
X-KDE-Keywords[ko]=ksmserver,session,logout,confirmation,save,restore,세션,로그아웃,확인,저장,복원,efi,uefi,bios X-KDE-Keywords[ko]=ksmserver,session,logout,confirmation,save,restore,세션,로그아웃,확인,저장,복원,efi,uefi,bios
......
...@@ -111,6 +111,7 @@ X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,yö,värit,punasiirtymä,silmät ...@@ -111,6 +111,7 @@ X-KDE-Keywords[fi]=kwin,ikkuna,hallinta,yö,värit,punasiirtymä,silmät
X-KDE-Keywords[fr]=kwin, gestionnaire, fenêtres, couleurs, nuit, colors, redshift, yeux X-KDE-Keywords[fr]=kwin, gestionnaire, fenêtres, couleurs, nuit, colors, redshift, yeux
X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,night,noite,colors,cores,redshift,eyes,ollos X-KDE-Keywords[gl]=kwin,window,xanela,manager,xestor,night,noite,colors,cores,redshift,eyes,ollos
X-KDE-Keywords[hu]=kwin,ablak,kezelő,éjszaka,színek,redshift,szem X-KDE-Keywords[hu]=kwin,ablak,kezelő,éjszaka,színek,redshift,szem
X-KDE-Keywords[ia]=kwin,window,manager,night,colors,redshift,eyes
X-KDE-Keywords[id]=kwin,window,pengelola,malam,warna,redshift,mata X-KDE-Keywords[id]=kwin,window,pengelola,malam,warna,redshift,mata
X-KDE-Keywords[it]=kwin,finestra,gestore,notte,colori,spostamento verso il rosso,occhi X-KDE-Keywords[it]=kwin,finestra,gestore,notte,colori,spostamento verso il rosso,occhi
X-KDE-Keywords[ko]=kwin,window,manager,night,colors,redshift,eyes,창,관리자,밤,야간,색,눈,안구,블루라이트 X-KDE-Keywords[ko]=kwin,window,manager,night,colors,redshift,eyes,창,관리자,밤,야간,색,눈,안구,블루라이트
......
...@@ -106,6 +106,7 @@ X-KDE-Keywords[fi]=Search, File, Baloo, Runner, krunner, haku, etsi, tiedosto, s ...@@ -106,6 +106,7 @@ X-KDE-Keywords[fi]=Search, File, Baloo, Runner, krunner, haku, etsi, tiedosto, s
X-KDE-Keywords[fr]=Rechercher, fichier, baloo, lanceur, krunner X-KDE-Keywords[fr]=Rechercher, fichier, baloo, lanceur, krunner
X-KDE-Keywords[gl]=Busca, Ficheiro, Baloo, Balú, Iniciador, krunner X-KDE-Keywords[gl]=Busca, Ficheiro, Baloo, Balú, Iniciador, krunner
X-KDE-Keywords[hu]=Keresés, Fájl, Baloo, Indító, krunner X-KDE-Keywords[hu]=Keresés, Fájl, Baloo, Indító, krunner
X-KDE-Keywords[ia]=Search, File, Baloo, Runner, krunner
X-KDE-Keywords[id]=Pencarian, File, Baloo, Runner, krunner X-KDE-Keywords[id]=Pencarian, File, Baloo, Runner, krunner
X-KDE-Keywords[it]=ricerca,file,Baloo,esecutore,krunner X-KDE-Keywords[it]=ricerca,file,Baloo,esecutore,krunner
X-KDE-Keywords[ko]=Search, File, Baloo, Runner, krunner, 검색, 파일, 찾기, 실행기 X-KDE-Keywords[ko]=Search, File, Baloo, Runner, krunner, 검색, 파일, 찾기, 실행기
......
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