Commit 77d75dfb authored by Script Kiddy's avatar Script Kiddy

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 8cca521b
......@@ -21,7 +21,7 @@ Name[hu]=Alkalmazásmenü
Name[ia]=Menu de application
Name[id]=Menu Aplikasi
Name[is]=Forritavalmynd
Name[it]=Menu delle applicazioni
Name[it]=Menu dell'applicazione
Name[ja]=アプリケーションメニュー
Name[ko]=프로그램 메뉴
Name[lt]=Programų meniu
......
......@@ -112,7 +112,7 @@ Comment[hu]=Virtuális asztalok közötti váltásra szolgáló elem
Comment[ia]=Commuta inter scriptorios virtual
Comment[id]=Berpindah di antara desktop virtual
Comment[is]=Skiptir milli sýndarskjáborða
Comment[it]=Passa ad altri desktop virtuali
Comment[it]=Passa tra i desktop virtuali
Comment[ja]=仮想デスクトップを切り替えます
Comment[kk]=Виртуалды үстелдерді ақтару
Comment[km]=ប្ដូរ​រវាង​ផ្ទៃតុ​និម្មិត
......
......@@ -38,7 +38,7 @@ Name[hu]=KDE kezelési segédeszköz
Name[ia]=Instrumento de Accessibilitate de KDE
Name[id]=Alat Aksesibilitas KDE
Name[is]=KDE aðgengistól
Name[it]=Strumento per l'accessibilità di KDE
Name[it]=Strumento di KDE per l'accessibilità
Name[ja]=KDE アクセシビリティ支援ツール
Name[ka]=KDE-ს სპეცეციალური შესაძლებლობების ხელსაწყოები
Name[kk]=KDE арнайы мүмкіндіктер құралы
......
......@@ -166,7 +166,7 @@ Description[hu]=A rendszer házirendjei nem engedik Önnek a dátum- és időbe
Description[ia]=Le politicas de systema preveni te ex salveguardar le preferentias de tempore/data.
Description[id]=Kebijakan sistem menghalangi anda untuk menyimpan setelan tanggal/waktu.
Description[is]=Öryggisstillingar kerfisins koma í veg fyrir að þú getir vistað tíma/dagsetningu.
Description[it]=Le regole di condotta del sistema impediscono di salvare le impostazioni di data e ora.
Description[it]=Le politiche del sistema ti impediscono di salvare le impostazioni di data e ora.
Description[ja]=システムポリシーにより、日時設定を保存することができません。
Description[kk]=Күн/уақыт параметрлерін сақтауды болдырмайтын жүйелік ережелері.
Description[km]=គោលនយោបាយ​ប្រព័ន្ធ​ ការពារ​អ្នក​​មិន​ឲ្យ​រក្សាទុក​ការកំណត់​កាលបរិច្ឆេទ/ពេលវេលា ។
......
......@@ -128,7 +128,7 @@ X-KDE-Keywords[hu]=nyelv,fordítás,számformátum,területi beállítás,Orszá
X-KDE-Keywords[ia]=linguage,traduction,formato de numero,locale,Pais,charsets,insimul de characteres, Symbolo decimal,separator de milles,symbolo,separator,signo,positive,negative,numerario,moneta,cifras fractional,calendario,tempore,data,formatos,septimana,initio de septimana, prime,papiro,grandor,littera,A4,me
X-KDE-Keywords[id]=bahasa,terjemahan,format angka,locale,Negara,set karakter,set karakter,Simbol desimal,Pemisah ribuan,simbol,pemisah,tanda,positif,negatif,mata uang,uang,digit fraksi,kalender,waktu,tanggal,format,minggu,awal minggu,pertama,kertas,ukuran,surat,A4,satuan,metrik,Inggris,Imperial
X-KDE-Keywords[is]=tungumál,þýðing,talnasnið,staðfærsla,Land,stafasett,stafatafla,tugatákn,þúsund,tákn,aðgreinir,merki,jákvætt,neikvætt,gjaldmiðill,peningar,tugabrot,dagatal,tími,dagsetning,snið,vika,upphafsdagur,fyrst,pappír,size,bréf,A4,mál,metra,Enskt,Imperial
X-KDE-Keywords[it]=language,translation,number format,locale,nazione,codifica,insieme dei caratteri,simbolo decimale,separatore delle migliaia,simbolo,separatore,segno,positivo,negativo,moneta,cifre decimali,calendario,ora,data,formati,settimana,inizio settimana,primo,carta,dimensione,lettera,A4,misura,metrico,inglese,imperiale
X-KDE-Keywords[it]=lingua,traduzione,formato dei numeri,localizzazione,nazione,codifica,insieme dei caratteri,simbolo decimale,separatore delle migliaia,simbolo,separatore,segno,positivo,negativo,moneta,cifre decimali,calendario,ora,data,formati,settimana,inizio settimana,primo,carta,dimensione,lettera,A4,misura,metrico,inglese,imperiale
X-KDE-Keywords[kk]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
X-KDE-Keywords[km]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial
X-KDE-Keywords[ko]=language,translation,number format,locale,Country,charsets,character sets,Decimal symbol,Thousands separator,symbol,separator,sign,positive,negative,currency,money,fractional digits,calendar,time,date,formats,week,week start,first,paper,size,letter,A4,measure,metric,English,Imperial,언어,번역,숫자,로캘,로케일,국가,나라,지역,문자셋,문자 인코딩,인코딩,소숫점,기호,구분자,양수,음수,통화,화폐,돈,달력,시간,시각,날짜,주,시작 요일,요일,종이,크기,미터법
......
......@@ -183,7 +183,7 @@ Description[hu]=A rendszerbetűtípusok beállításainak módosításához jogo
Description[ia]=Le modification de le configuration de tote le systema exige privilegios
Description[id]=Memodifikasi konfigurasi fonta system-wide memerlukan hak akses.
Description[is]=Breytingar á letri kerfisins krefjast kerfisstjóraaðgangs
Description[it]=Modificare la configurazione dei caratteri di sistema richiede dei privilegi.
Description[it]=La modifica della configurazione dei caratteri di sistema richiede dei privilegi.
Description[ja]=システム全般のフォント設定を変更するには権限が必要です。
Description[kk]=Жалпы жүйелік қаріптерді баптау үшін лайықты құқықтар керек.
Description[km]=ត្រូវការ​សិទ្ធិ​ក្នុងការ​កែប្រែ​ការកំណត់​រចនាសម្ព័ន្ធ​ពុម្ពអក្សរ​ប្រព័ន្ធ​ទាំង​មូល ។
......
......@@ -47,7 +47,7 @@ Name[hu]=Alkalmazásindítási effektus
Name[ia]=Retorno de lanceamento
Name[id]=Tanggapan Luncur
Name[is]=Upplýsingar um ræsingu
Name[it]=Segnale di avvio delle applicazioni
Name[it]=Notifica di avvio delle applicazioni
Name[ja]=起動フィードバック
Name[ka]=პროგრამის გაშვება
Name[kk]=Жегу барысы
......@@ -118,7 +118,7 @@ Comment[he]=משוב הפעלת יישומים
Comment[hu]=Alkalmazásindítási effektus
Comment[id]=Tanggapan Luncur Aplikasi
Comment[is]=Upplýsingar við forritaræsingu
Comment[it]=Segnale di avvio delle applicazioni
Comment[it]=Notifica di avvio delle applicazioni
Comment[ja]=アプリケーションの起動フィードバック
Comment[ko]=프로그램 실행 피드백
Comment[lt]=Programų paleidimo atsakas
......@@ -164,7 +164,7 @@ X-KDE-Keywords[gl]=aplicación,aplicativo,programa,inicio,iniciar,ocupado,cursor
X-KDE-Keywords[hu]=alkalmazás,indítás,indítás,elfoglalt,kurzor,visszajelzés,egér,mutató,pattogás,forgatás,csavarás,lemez,indítás,program,jelentés,feladatsáv
X-KDE-Keywords[ia]=application,initio,lancea,occupate,cursor,retro information,mus,punctator,saltante,rotante,torneante,disco,initio,programma,reporto,barra de carga
X-KDE-Keywords[id]=aplikasi,mulai,luncur,sibuk,kursor,tanggapan,mouse,penunjuk,berpantul,berputar,berpusing,cakram,permulaian,program,laporan,bilah tugas
X-KDE-Keywords[it]=applicazione,avvia,esegui,occupato,puntatore,segnale di avvio,mouse,puntatore,rimbalza,rotazione,disco,avvio,programma,resoconto,barra dei processi
X-KDE-Keywords[it]=applicazione,avvia,esegui,occupato,puntatore,notifica di avvio,mouse,puntatore,rimbalza,rotazione,disco,avvio,programma,resoconto,barra dei processi
X-KDE-Keywords[kk]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar
X-KDE-Keywords[km]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar
X-KDE-Keywords[ko]=application,start,launch,busy,cursor,feedback,mouse,pointer,bouncing,rotating,spinning,disk,startup,program,report,taskbar,프로그램,앱,시작,실행,바쁨,커서,마우스,포인터,디스크,시작,프로그램,작업 표시줄
......
......@@ -35,7 +35,7 @@ Name[hu]=Alkalmazásindítási effektus
Name[ia]=Retorno de lanceamento
Name[id]=Tanggapan Luncur
Name[is]=Upplýsingar um ræsingu
Name[it]=Segnale di avvio delle applicazioni
Name[it]=Notifica di avvio delle applicazioni
Name[ja]=起動フィードバック
Name[ka]=პროგრამის გაშვება
Name[kk]=Жегу барысы
......@@ -106,7 +106,7 @@ Comment[he]=משוב הפעלת יישומים
Comment[hu]=Alkalmazásindítási effektus
Comment[id]=Tanggapan Luncur Aplikasi
Comment[is]=Upplýsingar við forritaræsingu
Comment[it]=Segnale di avvio delle applicazioni
Comment[it]=Notifica di avvio delle applicazioni
Comment[ja]=アプリケーションの起動フィードバック
Comment[ko]=프로그램 실행 피드백
Comment[lt]=Programų paleidimo atsakas
......
......@@ -158,6 +158,7 @@ X-KDE-Keywords[es]=Ratón,Aceleración de ratón,Umbral del ratón,Botones del r
X-KDE-Keywords[eu]=sagu,saguaren azelerazio,saguaren atalase,saguaren botoiak,hautapena,kurtsorearen forma,sarrerako gailuak,botoiak mapatzea,klik,ikonoak,oharrak,erakusle,arrastatu,mapatze,eskuina,ezkerra,erakuslearen gailu,saguaren gurpil, saguaren emulazio,sagu bidezko nabigazio,saguaren bidez arrastatu eta jaregin, saguaren bidez korritu,saguaren sentikortasuna,sagua zenbakizko teklatuarekin mugitzea,sagua emulatzea zenbakizko teklatuarekin
X-KDE-Keywords[fr]=Souris, Accélération de la souris, Seuil de la souris, Boutons de la souris, Sélection, Forme du curseur, Périphériques d'entrée, affectation des boutons, Clic, icônes, réaction, Pointeurs, Glisser, affectation, droitier, gaucher, Périphérique de pointage, Roulette de la souris, Émulation de la souris, Navigation de la souris, Glisser-déposer, Défilement de la souris, Sensibilité de la souris, Déplacement de la souris avec le pavé numérique, Émulation de la souris du pavé numérique
X-KDE-Keywords[id]=Mouse,akselerasi Mouse,ambang batas Mouse,tombol Mouse,Pemilihan,Bentuk Kursor,Perangkat Input,Pemetaan Tombol,Klik,ikon,tanggapan,Penunjuk,Tarik,pemetaan,tangan kanan,tangan kiri,Perangkat Penunjuk,Roda Mouse,Emulasi Mouse,Navigasi Mouse,Seret dan Letakkan Mouse,Pengguliran Mouse,Sensitivitas Mouse,Gerakkan Mouse dengan Papan Numerik,Emulasi Papan Numerik Mouse
X-KDE-Keywords[it]=mouse,accelerazione del mouse,soglia del mouse,pulsanti del mouse,selezione,forma del puntatore,dispositivi di ingresso,mappatura dei pulsanti,clic,icone,notifica di avvio,puntatori,trascinamento,mappatura,destrorso,mancino,dispositivo di puntamento,rotellina del mouse,emulazione del mouse,navigazione con il mouse, trascinamento con il mouse,scorrimento con il mouse, sensibilità del mouse,muovi il mouse con il tastierino numerico,emulazione del mouse col tastierino numerico
X-KDE-Keywords[nl]=muis,muisversnelling,muisdrempel,muisknoppen,selectie,cursorvorm,invoerapparaten,knoppenmapping,klik,pictogrammen,terugkoppeling,aanwijzer,slepen,mapping,rechtshandig,linkshandig,aanwijsapparaat,muiswiel,muisemulatie,muisnavigatie,slepen en loslaten met muis,schuiven met de muis,muisgevoeligheid,muis bewegen met num-pad,emulatie van num-pad met muis
X-KDE-Keywords[nn]=mus,peikarakselerasjon,peikarterskel,knappar,val,peikarform,inndataeiningar,knappetilordning,klikk, ikon,oppstartsmelding,peikarar,dra,knapperekkjefølgje,høgrehendt,venstrehendt,peikareining,musehjul,musemulering,musenavigasjon,dra-og-slepp med mus,muserulling,flytt mus med taltastatur,museemulering med taltastatur
X-KDE-Keywords[pl]=Mysz,Przyspieszenie myszy,Próg myszy,Przyciski myszy,Zaznaczenie, Kształt kursora,Urządzenia wejścia,Mapowanie przycisków,Kliknięcie,ikony,odczucie,Wskaźniki,Przeciągnięcie,mapowanie,praworęczny,leworęczny, Urządzenie wskazujące,Rolka myszy,Emulacja myszy,Nawigacja myszą,Przeciąganie i upuszczanie myszą,Przewijanie myszą,Czułość myszy,Przemieszczaj myszą przy użyciu klawiatury numerycznej,Emulacja myszy klawiaturą numeryczną
......
......@@ -126,7 +126,7 @@ X-KDE-Keywords[hu]=Hang,Phonon,Hang,Videó,Kimenet,Eszköz,Értesítés,Zene,Kom
X-KDE-Keywords[ia]=Sono,Phonon,Audio,Video,Exito,Dispositivo,Notification,Musica,Communication,Medios,NMM,GStreamer,Xine
X-KDE-Keywords[id]=Suara,Phonon,Audio,Video,Output,Perangkat,Pemberitahuan,Musik,Komunikasi,Media,NMM,GStreamer,Xine
X-KDE-Keywords[is]=Hljóð,Phonon,Audio,Vídeó,Úttak,Tæki,Tilkynningar,Tónlist,Samskipti,Miðlar,NMM,GStreamer,Xine
X-KDE-Keywords[it]=suono,Phonon,audio,video,output,dispositivo,notifica,music,comunicazione,media,NMM,GStreamer,Xine
X-KDE-Keywords[it]=suono,Phonon,audio,video,output,dispositivo,notifica,musica,comunicazione,media,NMM,GStreamer,Xine
X-KDE-Keywords[kk]=Sound,Phonon,Audio,Video,Output,Device,Notification,Music,Communication,Media,NMM,GStreamer,Xine
X-KDE-Keywords[km]=សំឡេង Phonon អូឌីយ៉ូ វីដេអូ លទ្ធផល ឧបករណ៍ ការ​ជូនដំណឹង តន្ត្រី ការ​ទាក់ទង មេឌៀ NMM GStreamer Xine
X-KDE-Keywords[ko]=Sound,Phonon,Audio,Video,Output,Device,Notification,Music,Communication,Media,NMM,GStreamer,Xine,소리,사운드,오디오,비디오,동영상,음악,출력,장치,알림,대화,미디어
......
......@@ -387,7 +387,7 @@ Name[hu]=Fájlrendszer
Name[ia]=Typo Fs
Name[id]=Tipe Sistem Berkas
Name[is]=Tegund skráakerfis
Name[it]=Tipo di filesystem
Name[it]=Tipo di file system
Name[ja]=Fs タイプ
Name[kk]=ФЖ түрі
Name[km]=ប្រភេទ Fs
......
......@@ -95,7 +95,7 @@ Name[hu]=Utasításkészletek
Name[ia]=Insimules de instruction
Name[id]=Perangkat Instruksi
Name[is]=Inntaksaðgerðir (instruction sets)
Name[it]=Serie di istruzioni
Name[it]=Insiemi di istruzioni
Name[ja]=命令セット
Name[kk]=Нұсқаулар жиыны
Name[km]=សំណុំ​សេចក្ដី​ណែនាំ
......
......@@ -101,7 +101,7 @@ Name[hu]=Elérési út
Name[ia]=Percurso de file
Name[id]=Alur File
Name[is]=Skráarslóð
Name[it]=Percorso di file
Name[it]=Percorso del file
Name[ja]=ファイルのパス
Name[kk]=Файл жолы
Name[km]=ផ្លូវ​ឯកសារ
......
......@@ -29,7 +29,7 @@ Name[hu]=Fájlrendszer
Name[ia]=Typo Fs
Name[id]=Tipe Sistem Berkas
Name[is]=Tegund skráakerfis
Name[it]=Tipo di filesystem
Name[it]=Tipo di file system
Name[ja]=Fs タイプ
Name[kk]=ФЖ түрі
Name[km]=ប្រភេទ Fs
......
......@@ -40,7 +40,7 @@ Name[hu]=Eszközműveletek
Name[ia]=Actiones de dispositivos
Name[id]=Aksi Perangkat
Name[is]=Aðgerðir tækis
Name[it]=Azioni dei dispositivi
Name[it]=Azioni del dispositivo
Name[ja]=デバイスに対するアクション
Name[kk]=Құрылғы әрекеттері
Name[km]=សកម្មភាព​ឧបករណ៍
......
......@@ -107,6 +107,7 @@ X-KDE-Keywords[es]=plasma,espacio de trabajo,consola,factor de forma,tablero de
X-KDE-Keywords[eu]=plasma,langunea,shell,formfactor,forma,dashboard,aginte-mahaia,tooltips, tresnen argibidek,informational tips,informatzeko argibideak,klik, klik bakuna,klik bikoitza
X-KDE-Keywords[fr]=plasma, espace de travail, environnement, facteur de forme, tableau de bord, astuces d'informations, infobulles, clic, simple clic, double clic
X-KDE-Keywords[id]=plasma,ruang kerja,shell,formfactor,dasbor,tip alat,tip penginformasian,tip alat,klik,klik tunggal,klik ganda
X-KDE-Keywords[it]=plasma,spazio di lavoro,shell,fattore di forma,cruscotto,suggerimenti,suggerimenti informativi,clic,singolo clic,doppio clic
X-KDE-Keywords[nl]=plasma,werkruimte,shell,vormfactor,dashboard,tekstballonnen,informatieve tips,tekstballonnen,klik,dubbelklik
X-KDE-Keywords[nn]=plasma,arbeidsområde,skal,formfaktor,kontrollpult,hjelpebobler,verktøytips,informasjonsbobler,klikk,enkeltklikk,dobbeltklikk
X-KDE-Keywords[pl]=plazma,przestrzeń robocza,powłoka,współczynnik kształtu,tablica,podpowiedzi,informacyjne wskazówki,kliknięcie,jednokrotne kliknięcie,dwukrotne kliknięcie
......
......@@ -63,7 +63,7 @@ Comment[gl]=Monta automaticamente os dispositivos cando sexa preciso
Comment[he]=הצב אוטומטית אם צריך
Comment[hu]=Eszközök automatikus csatolása szükség szerint
Comment[id]=Mount perangkat secara otomatis ketika diperlukan
Comment[it]=Monta automaticamente i dispositivi quando server
Comment[it]=Monta automaticamente i dispositivi quando servono
Comment[ko]=필요할 때 자동으로 장치를 마운트합니다
Comment[lt]=Prireikus automatiškai prijungia įrenginius
Comment[nl]=Koppelt automatisch apparaten aan zoals nodig is
......
......@@ -18,7 +18,7 @@ Name[hu]=Deklaratív eszközdoboz
Name[ia]=Instrumentario declarative
Name[id]=Kotak Alat Deklaratif
Name[is]=Skilgreininga-verkfærasafn
Name[it]=Strumenti dichiarativi
Name[it]=Strumento dichiarativo
Name[kk]=Мәлімдеме құралдары
Name[ko]=Declarative 도구 상자
Name[lt]=Deklaratyvi įrankinė
......
......@@ -20,7 +20,7 @@ Name[hu]=Panel eszköztár
Name[ia]=Instrumentario de pannello
Name[id]=Kotak Alat Panel
Name[is]=Verkfærasafn fyrir spjöld
Name[it]=Strumenti per pannelli
Name[it]=Strumento per pannelli
Name[ja]=パネルツールボックス
Name[kk]=Панель құралдары
Name[ko]=패널 도구 상자
......
......@@ -22,7 +22,7 @@ Comment[hu]=Alapértelmezett panel eszközkészlet a Plasma asztali héjhoz
Comment[ia]=Instrumentario de pannello pro le shell de scriptorio de Plasma
Comment[id]=Bilah alat panel baku untuk shell desktop Plasma
Comment[is]=Sjálfgefið verkfærasafn með Plasma skjáborðsskelinni
Comment[it]=Strumenti predefiniti dei pannelli per la shell del desktop di Plasma
Comment[it]=Strumento predefinito del pannello per la shell del desktop di Plasma
Comment[ja]=Plasma デスクトップシェルの標準パネルツールボックス
Comment[kk]=Plasma үстел ортасының әдетті панель құралдары
Comment[km]=ប្រអប់​ឧបករណ៍​បន្ទះ​លំនាំដើម​សម្រាប់​សែល​ផ្ទៃតុ​ប្លា​ស្មា
......@@ -79,7 +79,7 @@ Name[hu]=Panel eszköztár
Name[ia]=Instrumentario de pannello
Name[id]=Kotak alat panel
Name[is]=Verkfærasafn fyrir spjöld
Name[it]=Strumenti per pannelli
Name[it]=Strumento per pannelli
Name[ja]=パネルツールボックス
Name[ko]=패널 도구 상자
Name[lt]=Skydelio įrankinė
......
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