SVN_SILENT made messages (.desktop file)

SVN_SILENT made messages (.desktop file) - always resolve ours
2026-07-01 15:51:18 -07:00 · 2016-04-12 14:08:43 +00:00 · 2016-03-25 13:05:57 +00:00 · 2016-01-23 10:35:57 +00:00 · 2016-01-07 10:10:04 +00:00 · 2016-01-07 00:33:40 +01:00
3 changed files with 1 additions and 5 deletions
--- a/framebuffers/qt/krfb_framebuffer_qt.json
+++ b/framebuffers/qt/krfb_framebuffer_qt.json
@@ -8,7 +8,6 @@
        "Description[de]": "Qt-basierter Framebuffer für KRfb", 
        "Description[en_GB]": "Qt based Framebuffer for KRfb.", 
        "Description[es]": "Framebuffer basado en Qt para KRfb.", 
-        "Description[et]": "KRfb Qt põhine kaadripuhver", 
        "Description[fi]": "QT-perustainen Kehyspuskuri KRfb:lle", 
        "Description[gl]": "Framebuffer baseado en Qt para KRfb.", 
        "Description[it]": "Framebuffer basato su Qt per KRfb.", 
@@ -32,13 +31,13 @@
        "Id": "qt", 
        "License": "GPL", 
        "Name": "Qt Framebuffer for KRfb", 
+        "Name[ast]": "Framebuffer Qt pa KRfb", 
        "Name[ca@valencia]": "«Framebuffer» Qt per al KRfb.", 
        "Name[ca]": "«Framebuffer» Qt per al KRfb.", 
        "Name[cs]": "Qt Framebuffer pro KRfb", 
        "Name[de]": "Qt-Framebuffer für KRfb", 
        "Name[en_GB]": "Qt Framebuffer for KRfb", 
        "Name[es]": "Framebuffer de Qt para KRfb", 
-        "Name[et]": "KRfb Qt kaadripuhver", 
        "Name[fi]": "QT-kehyspuskuri KRfb:lle", 
        "Name[gl]": "Framebuffer de Qt para KRfb", 
        "Name[it]": "Framebuffer Qt per KRfb", 
--- a/framebuffers/x11/krfb_framebuffer_x11.json
+++ b/framebuffers/x11/krfb_framebuffer_x11.json
@@ -8,7 +8,6 @@
        "Description[de]": "X11 XDamage/XShm-basierter Framebuffer für KRfb.", 
        "Description[en_GB]": "X11 XDamage/XShm based Framebuffer for KRfb.", 
        "Description[es]": "Framebuffer basado en XDamage/XShm de X11 para KRfb.", 
-        "Description[et]": "KRfb X11 XDamage/XShm põhine kaadripuhver", 
        "Description[fi]": "X11 XDamage/XShm-perustainen kehyspuskui KRfb:lle.", 
        "Description[gl]": "Framebuffer baseado en Xll XDamage/Xshm para XRfb.", 
        "Description[it]": "Framebuffer basato su XDamage/XShm di X11 per KRfb.", 
@@ -38,7 +37,6 @@
        "Name[de]": "X11-Framebuffer für KRfb", 
        "Name[en_GB]": "X11 Framebuffer for KRfb", 
        "Name[es]": "Framebuffer X11 para KRfb", 
-        "Name[et]": "KRfb X11 kaadripuhver", 
        "Name[fi]": "X11-kehyspuskuri KRfb:lle", 
        "Name[gl]": "Framebuffer de X11 para KRfb", 
        "Name[it]": "Framebuffer X11 per KRfb", 
--- a/krfb/krfb-framebuffer.json
+++ b/krfb/krfb-framebuffer.json
@@ -8,7 +8,6 @@
        "Description[de]": "Framebuffer-Module für KRfb", 
        "Description[en_GB]": "Frame Buffer plugins for KRfb", 
        "Description[es]": "Complementos de framebuffer para KRfb", 
-        "Description[et]": "KRfb kaadripuhvri plugin", 
        "Description[fi]": "Kehyspuskuriliitännäinen kohteelle KRfb", 
        "Description[gl]": "Engadido de frame buffer para KRfb", 
        "Description[it]": "Estensioni del framebuffer per KRfb",
Author	SHA1	Message	Date
l10n daemon script	07bb79f0db	SVN_SILENT made messages (.desktop file)	2016-04-12 14:08:43 +00:00
l10n daemon script	50554d39e5	SVN_SILENT made messages (.desktop file)	2016-03-25 13:05:57 +00:00
l10n daemon script	65595722bd	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"	2016-01-23 10:35:57 +00:00
l10n daemon script	916ffb525a	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"	2016-01-07 10:10:04 +00:00
Albert Astals Cid	ee5cb9eaf5	Merge remote-tracking branch 'origin/Applications/15.12'	2016-01-07 00:33:40 +01:00
l10n daemon script	def5195e63	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"	2015-12-30 09:33:48 +00:00
l10n daemon script	964386e2a6	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"	2015-12-29 11:26:11 +00:00
l10n daemon script	07439f6408	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"	2015-12-17 09:32:43 +00:00
l10n daemon script	405bec30f6	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"	2015-12-09 09:08:00 +00:00
l10n daemon script	c1904c41c7	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"	2015-11-26 15:56:42 +00:00
Jeremy Whiting	17752eba7c	Merge branch 'Applications/15.12'	2015-11-23 12:22:39 -07:00
l10n daemon script	ac6f4ca3ed	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"	2015-11-17 13:00:54 +00:00