Commit 66e77997 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 ef0e80c9
......@@ -50,7 +50,6 @@ X-KDE-Submenu[fi]=Yhdistä
X-KDE-Submenu[fr]=Connecter
X-KDE-Submenu[gl]=Conectar
X-KDE-Submenu[hu]=Csatlakozás
X-KDE-Submenu[ia]=Connecte
X-KDE-Submenu[it]=Connetti
X-KDE-Submenu[ko]=연결
X-KDE-Submenu[nl]=Verbinden
......
......@@ -59,7 +59,6 @@
"Name[fr]": "Moniteur de batterie",
"Name[gl]": "Vixilante da batería",
"Name[hu]": "Akkumulátorfigyelő",
"Name[ia]": "Controlator de batteria",
"Name[it]": "Monitor della batteria",
"Name[ko]": "배터리 모니터",
"Name[nl]": "Batterijmonitor",
......
......@@ -59,7 +59,6 @@
"Name[fr]": "Presse-papiers",
"Name[gl]": "Portapapeis",
"Name[hu]": "Vágólap",
"Name[ia]": "Area de transferentia",
"Name[it]": "Appunti",
"Name[ko]": "클립보드",
"Name[nl]": "Klembord",
......
......@@ -153,7 +153,6 @@ Name[fi]=Saapuva puhelu
Name[fr]=Appel entrant
Name[gl]=Chamada entrante
Name[hu]=Bejövő hívás
Name[ia]=Appello in arrivata
Name[it]=Chiamata in ingresso
Name[ko]=수신 전화
Name[nl]=Inkomende oproep
......@@ -367,7 +366,6 @@ Name[fi]=Akku vähissä
Name[fr]=Batterie faible
Name[gl]=Batería baixa
Name[hu]=Alacsony töltöttség
Name[ia]=Batteria basse
Name[it]=Batteria a livello basso
Name[ko]=배터리 부족
Name[nl]=Batterij op laag niveau
......@@ -581,7 +579,6 @@ Name[fi]=Tiedostonsiirto
Name[fr]=Transfert de fichiers
Name[gl]=Transferencia dun ficheiro
Name[hu]=Fájlátvitel
Name[ia]=Transferimento de file
Name[it]=Trasferimento file
Name[ko]=파일 전송
Name[nl]=Bestandsoverdracht
......
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